summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorMarc Seeger <mseeger@fb.com>2021-06-30 15:14:57 -0700
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-07-09 11:29:19 -0700
commit9889bdb6fb70e94532184d18cd418dd975afd610 (patch)
tree1bb285d548f7910692db2860eafe418f11b45b89 /pkgs/tools/compression
parenta7cb61bc545151dbbc32be7d10e435b6ee24531b (diff)
downloadnixpkgs-9889bdb6fb70e94532184d18cd418dd975afd610.tar
nixpkgs-9889bdb6fb70e94532184d18cd418dd975afd610.tar.gz
nixpkgs-9889bdb6fb70e94532184d18cd418dd975afd610.tar.bz2
nixpkgs-9889bdb6fb70e94532184d18cd418dd975afd610.tar.lz
nixpkgs-9889bdb6fb70e94532184d18cd418dd975afd610.tar.xz
nixpkgs-9889bdb6fb70e94532184d18cd418dd975afd610.tar.zst
nixpkgs-9889bdb6fb70e94532184d18cd418dd975afd610.zip
zstd: Add pzstd to compiled binaries
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/zstd/default.nix5
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" ]