diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-08-31 11:57:05 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:04:28 +0000 |
| commit | a0842e8b20cbe1ed717b72775428d1f8fc047fa4 (patch) | |
| tree | b86d0614a477f7e092d626d59b888d085aaca400 /nixpkgs/pkgs/tools/compression | |
| parent | c36b32d476b520ed0d2a37cd0973f98583d6dc7c (diff) | |
| parent | 8d1510abfb592339e13ce8f6db6f29c1f8b72924 (diff) | |
| download | nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.gz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.bz2 nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.lz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.xz nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.tar.zst nixlib-a0842e8b20cbe1ed717b72775428d1f8fc047fa4.zip | |
Merge commit '8d1510abfb592339e13ce8f6db6f29c1f8b72924'
Diffstat (limited to 'nixpkgs/pkgs/tools/compression')
| -rw-r--r-- | nixpkgs/pkgs/tools/compression/xar/default.nix | 12 | ||||
| -rw-r--r-- | nixpkgs/pkgs/tools/compression/zstd/default.nix | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/compression/xar/default.nix b/nixpkgs/pkgs/tools/compression/xar/default.nix index 3421045fe4c6..a794296bfd95 100644 --- a/nixpkgs/pkgs/tools/compression/xar/default.nix +++ b/nixpkgs/pkgs/tools/compression/xar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts }: +{ stdenv, fetchurl, libxml2, lzma, openssl, zlib, bzip2, fts, autoconf }: stdenv.mkDerivation rec { version = "1.6.1"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; }; - buildInputs = [ libxml2 lzma openssl zlib bzip2 fts ]; + buildInputs = [ libxml2 lzma openssl zlib bzip2 fts autoconf ]; + + prePatch = '' + substituteInPlace configure.ac \ + --replace 'OpenSSL_add_all_ciphers' 'OPENSSL_init_crypto' \ + --replace 'openssl/evp.h' 'openssl/crypto.h' + ''; + + preConfigure = "./autogen.sh"; meta = { homepage = https://mackyle.github.io/xar/; diff --git a/nixpkgs/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix index 257396e04289..5a153393ccdb 100644 --- a/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { - sha256 = "1f2nvhsx1fsd6zbnwvc6bbrm9ghkcvamqqg79fxgk5284rc6nynv"; + sha256 = "0mmgs98cfh92gcbjyv37vz8nq7x4x7fbzymlxyqd9awwpv9v0i5n"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; |