summary refs log tree commit diff
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2021-01-27 07:58:51 -0500
committerGitHub <noreply@github.com>2021-01-27 07:58:51 -0500
commit9c5389e47a6d7ab8a5110c12e84e57d22fd3af41 (patch)
tree1446774a974506f53982114811614a461898eb68
parentab224b550cc1a303b87dd07d29a12fcd10da5489 (diff)
parent4aa937d2e212285913563517f62641cbe6c1a129 (diff)
downloadnixpkgs-9c5389e47a6d7ab8a5110c12e84e57d22fd3af41.tar
nixpkgs-9c5389e47a6d7ab8a5110c12e84e57d22fd3af41.tar.gz
nixpkgs-9c5389e47a6d7ab8a5110c12e84e57d22fd3af41.tar.bz2
nixpkgs-9c5389e47a6d7ab8a5110c12e84e57d22fd3af41.tar.lz
nixpkgs-9c5389e47a6d7ab8a5110c12e84e57d22fd3af41.tar.xz
nixpkgs-9c5389e47a6d7ab8a5110c12e84e57d22fd3af41.tar.zst
nixpkgs-9c5389e47a6d7ab8a5110c12e84e57d22fd3af41.zip
Merge pull request #110771 from sternenseemann/zz
zz: install modules shipped with compiler
-rw-r--r--pkgs/development/compilers/zz/default.nix16
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix
index 3f77c49f556..dade163c527 100644
--- a/pkgs/development/compilers/zz/default.nix
+++ b/pkgs/development/compilers/zz/default.nix
@@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec {
 
   # commit chosen by using the latest build from http://bin.zetz.it/
   src = fetchFromGitHub {
-    owner = "aep";
+    owner = "zetzit";
     repo = "zz";
     rev = "0b5c52674e9adf795fbfb051d4dceef3126e669f";
     sha256 = "0bb77ll1g5i6a04ybpgx6lqsb74xs4v4nyqm9j4j6x24407h8l89";
@@ -16,13 +16,23 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1lf4k3n89w2797c1yrj1dp97y8a8d5hnixr1nwa2qcq1sxmm5rcg";
 
+  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; {
     description = "πŸΊπŸ™ ZetZ a zymbolic verifier and tranzpiler to bare metal C";
-    homepage = "https://github.com/aep/zz";
+    homepage = "https://github.com/zetzit/zz";
     license = licenses.mit;
     maintainers = [ maintainers.marsam ];
   };