diff options
author | sternenseemann <sternenseemann@systemli.org> | 2021-10-12 12:58:26 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2021-10-12 12:58:26 +0200 |
commit | a0bc1bfc5b79bcbf49f34be13dcd8ae7e816bc2d (patch) | |
tree | 03fcf91c131c5041ca538e9b303d98304e98826d | |
parent | 9bf75dd50b7b6d3ce6aaf6563db95f41438b9bdb (diff) |
zz: unstable-2021-03-07 -> unstable-2021-05-04
Tested by compiling hello example from upstream repository.
-rw-r--r-- | pkgs/development/compilers/zz/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/compilers/zz/default.nix b/pkgs/development/compilers/zz/default.nix index a0bf9a9ad8ff3..156a4c17bc2cc 100644 --- a/pkgs/development/compilers/zz/default.nix +++ b/pkgs/development/compilers/zz/default.nix @@ -1,20 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3 }: +{ lib, rustPlatform, fetchFromGitHub, makeWrapper, z3, pkgsHostTarget }: + +let + runtimeDeps = [ + z3 + pkgsHostTarget.targetPackages.stdenv.cc + ]; +in rustPlatform.buildRustPackage rec { pname = "zz"; - version = "unstable-2021-03-07"; + version = "unstable-2021-05-04"; # when updating, choose commit of the latest build on http://bin.zetz.it/ src = fetchFromGitHub { owner = "zetzit"; repo = "zz"; - rev = "d3fc968ba2ae6668f930e39077f9a90aecb9fdc4"; - sha256 = "18p17lgwq6rq1n76sj0dwb32bpxflfd7knky1v0sgmaxfpaq04y3"; + rev = "18020b10b933cfe2fc7f2256b71e646889f9b1d2"; + sha256 = "01nlyyk1qxk76dq2hw3wpbjwkh27zzp6mpczjnxdpv6rxs7mc825"; }; nativeBuildInputs = [ makeWrapper ]; - cargoSha256 = "03xdmm4993hqdb3cihjjv4n4mdk8lnlccva08fh6m1d56p807rni"; + cargoSha256 = "080rd8x4jsssnx4il80xcb81iw8pjcm70zckpa1hcijkw9104dgs"; postPatch = '' # remove search path entry which would reference /build @@ -26,7 +33,7 @@ rustPlatform.buildRustPackage rec { cp -r modules "$out/share/zz/" wrapProgram $out/bin/zz \ - --prefix PATH ":" "${lib.getBin z3}/bin" \ + --prefix PATH ":" "${lib.makeBinPath runtimeDeps}" \ --suffix ZZ_MODULE_PATHS ":" "$out/share/zz/modules" ''; |