diff options
| -rw-r--r-- | Justfile | 16 | ||||
| -rw-r--r-- | nix/candelabra.nix | 5 | ||||
| -rw-r--r-- | nix/racket-env.nix | 2 | ||||
| -rw-r--r-- | thesis/Justfile | 10 |
4 files changed, 14 insertions, 19 deletions
diff --git a/Justfile b/Justfile deleted file mode 100644 index b31b550..0000000 --- a/Justfile +++ /dev/null @@ -1,16 +0,0 @@ -default: build - -build: thesis -clean: thesis-clean - -alias t := thesis -thesis: - cd thesis/; latexmk -bibtex -pdf - -alias tw := thesis-watch -thesis-watch: - cd thesis/; latexmk -bibtex -pdf -pvc - -alias tc := thesis-clean -thesis-clean: - cd thesis/; latexmk -c 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 ''; } diff --git a/thesis/Justfile b/thesis/Justfile new file mode 100644 index 0000000..2805cb0 --- /dev/null +++ b/thesis/Justfile @@ -0,0 +1,10 @@ +default: build + +build: + cd thesis/; latexmk -bibtex -pdf + +watch: + cd thesis/; latexmk -bibtex -pdf -pvc + +clean: + cd thesis/; latexmk -c |