diff options
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/candelabra.nix | 5 | ||||
| -rw-r--r-- | nix/racket-env.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nix/candelabra.nix b/nix/candelabra.nix index da0a51c..192bf1f 100644 --- a/nix/candelabra.nix +++ b/nix/candelabra.nix @@ -13,14 +13,14 @@ inputs @ { src = craneLib.cleanCargoSource (craneLib.path ../src); doCheck = false; - propagatedBuildInputs = [(pkgs.callPackage ./racket-env.nix inputs)]; + propagatedBuildInputs = []; cargoExtraArgs = "-p candelabra-cli"; }; in pkgs.runCommand "candelabra" {} '' . ${pkgs.makeWrapper}/nix-support/setup-hook - mkdir -p $out/bin + mkdir -p $out/{bin,nix-support} makeWrapper ${rustCrate}/bin/candelabra $out/bin/candelabra \ --set CANDELABRA_SRC_DIR ${pkgs.lib.sourceByRegex ../src [ ".*crates" @@ -28,4 +28,5 @@ in ".*crates/library.*" ".*crates/benchmarker.*" ]} + echo "${pkgs.callPackage ./racket-env.nix inputs} ${toolchain}" > $out/nix-support/propagated-build-inputs '' diff --git a/nix/racket-env.nix b/nix/racket-env.nix index 0577b97..d05a4f8 100644 --- a/nix/racket-env.nix +++ b/nix/racket-env.nix @@ -426,8 +426,8 @@ in pkgs.stdenv.mkDerivation { name = "racket-wrapped"; buildInputs = [pkgs.makeWrapper]; - phases = ["installPhase"]; propagatedBuildInputs = [pkgs.z3]; + phases = ["installPhase" "fixupPhase"]; installPhase = '' mkdir -p $out/bin makeWrapper ${racket}/bin/racket $out/bin/racket \ |