diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-05-29 15:31:19 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-05-29 15:37:55 +0200 |
commit | afa9962538b12237f5a4604017fe9c0914404800 (patch) | |
tree | 314d63f212523aee8732c82aa331e8f9a03c785e | |
parent | 3a4fec82326f53fd14721aa3c4fd8560752f8982 (diff) | |
parent | 7f76daacdb0190ce91c95111cc3eba49cea41fd7 (diff) | |
download | nixlib-afa9962538b12237f5a4604017fe9c0914404800.tar nixlib-afa9962538b12237f5a4604017fe9c0914404800.tar.gz nixlib-afa9962538b12237f5a4604017fe9c0914404800.tar.bz2 nixlib-afa9962538b12237f5a4604017fe9c0914404800.tar.lz nixlib-afa9962538b12237f5a4604017fe9c0914404800.tar.xz nixlib-afa9962538b12237f5a4604017fe9c0914404800.tar.zst nixlib-afa9962538b12237f5a4604017fe9c0914404800.zip |
Merge #78910: libarchive: link to zstd (into staging)
Also split outputs and don't provide static lib by default.
-rw-r--r-- | pkgs/development/libraries/libarchive/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 14 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 2f89331f92c6..f919fb92ed1d 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DZSTD_BUILD_SHARED:BOOL=${if enableShared then "ON" else "OFF"}" + # They require STATIC for bin/zstd and tests. "-DZSTD_LEGACY_SUPPORT:BOOL=${if legacySupport then "ON" else "OFF"}" "-DZSTD_BUILD_TESTS:BOOL=ON" ]; @@ -50,11 +51,15 @@ 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c25de97cfbe9..df1272e41558 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7918,7 +7918,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 { }; |