From 7584d9fbf87e68c28f167af84d66688086b1de96 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Thu, 19 Jan 2023 15:03:50 +1100 Subject: [PATCH] zstd: fix cross-compilation on darwin --- pkgs/tools/compression/zstd/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index b4e1e105ceb0..5c04a943c10f 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -77,11 +77,13 @@ stdenv.mkDerivation rec { substituteInPlace ../programs/zstdless \ --replace "zstdcat" "$bin/bin/zstdcat" - '' + 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 - ''; + '' + 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" ] ++ lib.optional stdenv.hostPlatform.isUnix "man"