diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:30:23 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-04 15:30:36 +0200 |
commit | af2dd0c798101dc112108859a3c427979d4802fc (patch) | |
tree | 44a986e36967e9ebc068c283fc7018da07c2ed53 /pkgs | |
parent | b76c308ecdc7a90179b49a55abca0058e481cb5b (diff) | |
download | nixlib-af2dd0c798101dc112108859a3c427979d4802fc.tar nixlib-af2dd0c798101dc112108859a3c427979d4802fc.tar.gz nixlib-af2dd0c798101dc112108859a3c427979d4802fc.tar.bz2 nixlib-af2dd0c798101dc112108859a3c427979d4802fc.tar.lz nixlib-af2dd0c798101dc112108859a3c427979d4802fc.tar.xz nixlib-af2dd0c798101dc112108859a3c427979d4802fc.tar.zst nixlib-af2dd0c798101dc112108859a3c427979d4802fc.zip |
Revert "Revert "Merge pull request #78910 from serokell/libarchive-zstd""
The PR was accidentally merged into master instead of staging and thus reverted. Now, in staging, we can re-revert it. This reverts commit 4df2f78ec72f6a8d2fe286cd34eb3acdfcac81f3.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 118adc61623a..d1917de37d6a 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, - acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, + acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, # Optional but increases closure only negligibly. xarSupport ? true, @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] + buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optional xarSupport libxml2; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index eb42fdbaff4f..f919fb92ed1d 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -51,14 +51,16 @@ stdenv.mkDerivation rec { preInstall = '' substituteInPlace ../programs/zstdgrep \ --replace ":-grep" ":-${gnugrep}/bin/grep" \ - --replace ":-zstdcat" ":-$out/bin/zstdcat" + --replace ":-zstdcat" ":-$bin/bin/zstdcat" substituteInPlace ../programs/zstdless \ - --replace "zstdcat" "$out/bin/zstdcat" + --replace "zstdcat" "$bin/bin/zstdcat" ''; # Don't duplicate the library code in runtime closures. postInstall = stdenv.lib.optionalString enableShared ''rm "$out"/lib/libzstd.a''; + outputs = [ "bin" "dev" "man" "out" ]; + meta = with stdenv.lib; { description = "Zstandard real-time compression algorithm"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4214943ad523..662feb6d396c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7899,7 +7899,11 @@ in zssh = callPackage ../tools/networking/zssh { }; - zstd = callPackage ../tools/compression/zstd { }; + zstd = callPackage ../tools/compression/zstd { + cmake = cmake.override { + libarchive = libarchive.override { zstd = null; }; + }; + }; zsync = callPackage ../tools/compression/zsync { }; |