mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-05-16 14:11:07 +00:00
Code Issues Wiki Activity

Revert "Merge pull request #78910 from serokell/libarchive-zstd"

Browse source 
Should go to staging instead.

This reverts commit f8d9f59abe, reversing
changes made to b27a19d5bf.
This commit is contained in:
Frederik Rietdijk 2020-05-29 21:03:02 +02:00
parent f8d9f59abe
commit 4df2f78ec7
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/libarchive/default.nix
View file

@ -1,6 +1,6 @@
{ {
fetchFromGitHub, stdenv, pkgconfig, autoreconfHook, fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, zstd, acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
# Optional but increases closure only negligibly. # Optional but increases closure only negligibly.
xarSupport ? true, xarSupport ? true,
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "lib" "dev" ]; outputs = [ "out" "lib" "dev" ];
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ sharutils zlib bzip2 openssl xz lzo zstd ] buildInputs = [ sharutils zlib bzip2 openssl xz lzo ]
++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
++ stdenv.lib.optional xarSupport libxml2; ++ stdenv.lib.optional xarSupport libxml2;

6
pkgs/tools/compression/zstd/default.nix
View file

@ -50,14 +50,12 @@ stdenv.mkDerivation rec {
preInstall = '' preInstall = ''
substituteInPlace ../programs/zstdgrep \ substituteInPlace ../programs/zstdgrep \
--replace ":-grep" ":-${gnugrep}/bin/grep" \ --replace ":-grep" ":-${gnugrep}/bin/grep" \
--replace ":-zstdcat" ":-$bin/bin/zstdcat" --replace ":-zstdcat" ":-$out/bin/zstdcat"
substituteInPlace ../programs/zstdless \ substituteInPlace ../programs/zstdless \
--replace "zstdcat" "$bin/bin/zstdcat" --replace "zstdcat" "$out/bin/zstdcat"
''; '';
outputs = [ "bin" "dev" "man" "out" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Zstandard real-time compression algorithm"; description = "Zstandard real-time compression algorithm";
longDescription = '' longDescription = ''

6
pkgs/top-level/all-packages.nix
View file

@ -7916,11 +7916,7 @@ in
zssh = callPackage ../tools/networking/zssh { }; 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 { }; zsync = callPackage ../tools/compression/zsync { };