diff options
| author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
|---|---|---|
| committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
| commit | 90c78aee6c04e0f3444a6b73344871a6e8ff9ea5 (patch) | |
| tree | 0dd9562d2783db3223b20e66c55eba0b19ffabdd /pkgs/tools/compression | |
| parent | a1cd06f900febb73d1c4edb17685eec8499d6097 (diff) | |
| parent | 33afbf39f6f2a6b37e99f070ba7d17a28c416d02 (diff) | |
Merge branch 'nativeCheckInputs' into staging-nativeCheckInputs
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/lziprecover/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/tools/compression/lziprecover/default.nix index e322a19059017..38840a07092d2 100644 --- a/pkgs/tools/compression/lziprecover/default.nix +++ b/pkgs/tools/compression/lziprecover/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ lzip ]; + nativeCheckInputs = [ lzip ]; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index b4e1e105ceb04..6a489779cb02f 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { mkdir -p build_ && cd $_ ''; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; inherit doCheck; checkPhase = '' runHook preCheck @@ -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" |