diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-07-16 09:59:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-07-16 09:59:01 +0200 |
| commit | 3ea417e47f70a6b8e668afe340e137b517cc8d82 (patch) | |
| tree | b2d8cb7ff574fcc8d7ee319d4dcd9aa1e3895179 /pkgs/tools/compression | |
| parent | 7959589ea0b53a9c4fcbbd8ae24fc63a4dc44eee (diff) | |
| parent | 17668028aa06c359d8370bde172e41f32fa98cc7 (diff) | |
| download | nixpkgs-3ea417e47f70a6b8e668afe340e137b517cc8d82.tar nixpkgs-3ea417e47f70a6b8e668afe340e137b517cc8d82.tar.gz nixpkgs-3ea417e47f70a6b8e668afe340e137b517cc8d82.tar.bz2 nixpkgs-3ea417e47f70a6b8e668afe340e137b517cc8d82.tar.lz nixpkgs-3ea417e47f70a6b8e668afe340e137b517cc8d82.tar.xz nixpkgs-3ea417e47f70a6b8e668afe340e137b517cc8d82.tar.zst nixpkgs-3ea417e47f70a6b8e668afe340e137b517cc8d82.zip | |
Merge branch staging into staging-next
The staging version is a bit older already, used in pre-test: https://hydra.nixos.org/eval/1685435
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index a89453b55f4..5253d7faa40 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; BUILD_STATIC = static; + BUILD_CONTRIB = true; PROGRAMS_LINK_SHARED = !static; LEGACY_SUPPORT = legacySupport; BUILD_TESTS = doCheck; @@ -62,12 +63,16 @@ stdenv.mkDerivation rec { ''; preInstall = '' + mkdir -p $bin/bin + cp contrib/pzstd/pzstd $bin/bin/pzstd substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-zstdcat" ":-$bin/bin/zstdcat" 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 ''; outputs = [ "bin" "dev" ] |