diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-01-25 14:25:42 +0100 |
|---|---|---|
| committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-01-25 14:25:42 +0100 |
| commit | 4aa937d2e212285913563517f62641cbe6c1a129 (patch) | |
| tree | 236dd494f8252b371bba609e20ec4e7ff6ad6b32 /pkgs/development/compilers | |
| parent | 190173e05b41153cefe0fefb3c0771e6f42e8c07 (diff) | |
zz: install modules shipped with the compiler
Previously zz wouldn't be able to compile anything using standard
modules like mem or log out of the box.
To fix this we copy the modules directory included in the source to
$out/share/zz/modules and add an entry to ZZ_MODULE_PATHS in the wrapper
around zz.
We also remove a search path entry which used to reference /build
because it used CARGO_MANIFEST_DIR at build time. The default search
path now includes:
* /nix/store/modules
* $out/share/zz/modules
* $(pwd)/modules
Patching out /nix/store/modules would be kind of cumbersome as it is a
multi-line entry, but it probably does no harm and fine to leave in.
An issue arising by this PR might be that the added search path entry
may take priority over an user specified location even though we use
--suffix. This is because zz internally uses a HashSet which has no
guaranteed iteration order. This may lead to unexpected behavior for
users wo previously provided custom versions of the standard modules via
ZZ_MODULE_PATHS. However, this is an issue in upstream issue as well
where ZZ_MODULE_PATHS may or may not take priority over the compiled in
search path, so this issue should probably be resolved upstream (I'll
file a report or PR).
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/zz/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index cbf5e3bd9d8c..4d29e314c67b 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -15,8 +15,18 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0yllcqxyyhwr9h0z8q84l0ms8x6jrqhpg79ik4xng6h5yf4ab0pq"; + postPatch = '' + # remove search path entry which would reference /build + sed -i '/env!("CARGO_MANIFEST_DIR")/d' src/lib.rs + ''; + postInstall = '' - wrapProgram $out/bin/zz --prefix PATH ":" "${lib.getBin z3}/bin" + mkdir -p "$out/share/zz" + cp -r modules "$out/share/zz/" + + wrapProgram $out/bin/zz \ + --prefix PATH ":" "${lib.getBin z3}/bin" \ + --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules" ''; meta = with lib; { |