Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libarchive: link to zstd (split zstd output) #78910

Merged
merged 2 commits into from
May 29, 2020
Merged

libarchive: link to zstd (split zstd output) #78910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe9a655
zstd: enable split outputs
yorickvP Jan 30, 2020
414da94
libarchive: link against zstd
yorickvP Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libarchive/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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;

Expand Down
6 changes: 4 additions & 2 deletions pkgs/tools/compression/zstd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,14 @@ stdenv.mkDerivation rec {
preInstall = stdenv.lib.optionalString enableShared ''
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 = ''
Expand Down
6 changes: 5 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7649,7 +7649,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 { };

Expand Down