From fb5be44cbda72b1217d8ce5a451ef5f7cfe53593 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Mon, 17 Jan 2022 00:17:48 +0100 Subject: [PATCH] build launchapplserver as parrt of samples --- nix/samples.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nix/samples.nix b/nix/samples.nix index e71bfaf15e..24f9ac71d7 100644 --- a/nix/samples.nix +++ b/nix/samples.nix @@ -11,6 +11,7 @@ pkgs: prevPkgs: { installPhase = '' mkdir $out cp *.bin $out/ + rm -f $out/*.code.bin $out/*.rsrc.bin ''; }) ({ dialog = ../Samples/Dialog; @@ -24,7 +25,7 @@ pkgs: prevPkgs: { } // lib.optionalAttrs (targetPlatform.cmakeSystemName == "Retro68") { systemextension = ../Samples/SystemExtension; launcher = ../Samples/Launcher; - }); + }) // { launchapplserver = self.launchapplserver; }; in runCommand "retro68.samples" { } '' mkdir -p $out/ @@ -40,7 +41,8 @@ pkgs: prevPkgs: { nativeBuildInputs = [ buildPackages.ninja buildPackages.cmake ]; installPhase = '' mkdir $out - cp *.bin $out/ + cp Server/*.bin $out/ + rm $out/*.code.bin $out/*.rsrc.bin ''; }; });