diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-07-25 09:42:35 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-25 09:45:29 +0200 |
| commit | 76f4182a36e9bfb7497868170d57e5bbf0c43887 (patch) | |
| tree | 1d5ce076db79f1846a1f3aace502a57c9be6a9b9 /pkgs/tools/compression/zstd/default.nix | |
| parent | 6a5e4f2c3d8e311ea789590c35585712c287098e (diff) | |
| download | nixpkgs-76f4182a36e9bfb7497868170d57e5bbf0c43887.tar nixpkgs-76f4182a36e9bfb7497868170d57e5bbf0c43887.tar.gz nixpkgs-76f4182a36e9bfb7497868170d57e5bbf0c43887.tar.bz2 nixpkgs-76f4182a36e9bfb7497868170d57e5bbf0c43887.tar.lz nixpkgs-76f4182a36e9bfb7497868170d57e5bbf0c43887.tar.xz nixpkgs-76f4182a36e9bfb7497868170d57e5bbf0c43887.tar.zst nixpkgs-76f4182a36e9bfb7497868170d57e5bbf0c43887.zip | |
zstd: fixup wrong preInstall order for isDarwin
This regressed in 03e499425 (PR #129873).
Diffstat (limited to 'pkgs/tools/compression/zstd/default.nix')
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 16504d50dbf..f87a144f7cc 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -73,10 +73,10 @@ stdenv.mkDerivation rec { substituteInPlace ../programs/zstdless \ --replace "zstdcat" "$bin/bin/zstdcat" - '' + lib.optionalString stdenv.isDarwin '' - install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd '' + lib.optionalString buildContrib '' cp contrib/pzstd/pzstd $bin/bin/pzstd + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libzstd.1.dylib $out/lib/libzstd.1.dylib $bin/bin/pzstd ''; outputs = [ "bin" "dev" ] |