diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-05-29 20:51:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 20:51:16 +0200 |
| commit | f8d9f59abe02ce97f621da24723156934a54611e (patch) | |
| tree | c286c441dbe1012c169bc82f0bb1e32d8b564fab /pkgs | |
| parent | b27a19d5bf799f581a8afc2b554f178e58c1f524 (diff) | |
| parent | 414da94fedd80cac992df835dfbd4a1efd388395 (diff) | |
| download | nixpkgs-f8d9f59abe02ce97f621da24723156934a54611e.tar nixpkgs-f8d9f59abe02ce97f621da24723156934a54611e.tar.gz nixpkgs-f8d9f59abe02ce97f621da24723156934a54611e.tar.bz2 nixpkgs-f8d9f59abe02ce97f621da24723156934a54611e.tar.lz nixpkgs-f8d9f59abe02ce97f621da24723156934a54611e.tar.xz nixpkgs-f8d9f59abe02ce97f621da24723156934a54611e.tar.zst nixpkgs-f8d9f59abe02ce97f621da24723156934a54611e.zip | |
Merge pull request #78910 from serokell/libarchive-zstd
libarchive: link to zstd (split zstd output)
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 0f6b196d150..69feed39818 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 2f89331f92c..d1ed0da1d14 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -50,12 +50,14 @@ 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" ''; + 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 c95d210ffe5..faa8c8fc416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7916,7 +7916,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 { }; |