From 76f4182a36e9bfb7497868170d57e5bbf0c43887 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 25 Jul 2021 09:42:35 +0200 Subject: zstd: fixup wrong preInstall order for isDarwin This regressed in 03e499425 (PR #129873). --- pkgs/tools/compression/zstd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/compression/zstd/default.nix') 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" ] -- cgit 1.4.1