aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorAria Shrimpton <me@aria.rip>2024-01-30 00:06:00 +0000
committerAria Shrimpton <me@aria.rip>2024-01-30 00:06:00 +0000
commite468995e496806811536e38e7e55d16c209b19bd (patch)
treec007b7c3b8852f0e06245a5bc59d50d2e40a35a1 /nix
parent2559da1fbf3a7e78ae105108a314cad106237368 (diff)
more cleanup
Diffstat (limited to 'nix')
-rw-r--r--nix/candelabra.nix5
-rw-r--r--nix/racket-env.nix2
2 files changed, 4 insertions, 3 deletions
diff --git a/nix/candelabra.nix b/nix/candelabra.nix
index 192bf1f..0ee4a2d 100644
--- a/nix/candelabra.nix
+++ b/nix/candelabra.nix
@@ -27,6 +27,7 @@ in
".*racket_specs.*"
".*crates/library.*"
".*crates/benchmarker.*"
- ]}
- echo "${pkgs.callPackage ./racket-env.nix inputs} ${toolchain}" > $out/nix-support/propagated-build-inputs
+ ]} \
+ --prefix PATH : ${pkgs.callPackage ./racket-env.nix inputs}/bin
+ --prefix PATH : ${toolchain}/bin
''
diff --git a/nix/racket-env.nix b/nix/racket-env.nix
index d05a4f8..af924b1 100644
--- a/nix/racket-env.nix
+++ b/nix/racket-env.nix
@@ -426,11 +426,11 @@ in
pkgs.stdenv.mkDerivation {
name = "racket-wrapped";
buildInputs = [pkgs.makeWrapper];
- propagatedBuildInputs = [pkgs.z3];
phases = ["installPhase" "fixupPhase"];
installPhase = ''
mkdir -p $out/bin
makeWrapper ${racket}/bin/racket $out/bin/racket \
--set PLTADDONDIR ${collection};
+ --prefix PATH : ${pkgs.z3}/bin
'';
}