diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-23 01:26:34 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-23 17:26:49 +0000 |
| commit | 4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0 (patch) | |
| tree | 17c88dfcdff1502a1173806303f7cf209531f61d /pkgs/tools/compression | |
| parent | 069e9fd44928de4235b0a01dd0207fdd9b5b5359 (diff) | |
| parent | c1966522d7d5fa54db068140d212cba18731dd98 (diff) | |
| download | nixlib-4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0.tar nixlib-4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0.tar.gz nixlib-4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0.tar.bz2 nixlib-4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0.tar.lz nixlib-4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0.tar.xz nixlib-4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0.tar.zst nixlib-4686cfcc94cfb46b79002f8eed0dc5624e8ba1a0.zip | |
Merge remote-tracking branch 'upstream/master' into mingw-rocksdb
Can just use single commit from https://github.com/facebook/rocksdb/pull/6076 for rocksdb!
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/brotli/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/compression/zstd/default.nix | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix index 33b6f12cd46c..229c6c8b8e4e 100644 --- a/pkgs/tools/compression/brotli/default.nix +++ b/pkgs/tools/compression/brotli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, fetchpatch, staticOnly ? false }: # ?TODO: there's also python lib in there @@ -15,7 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = []; + patches = stdenv.lib.optional staticOnly (fetchpatch { + url = "https://github.com/google/brotli/pull/655/commits/7289e5a378ba13801996a84d89d8fe95c3fc4c11.patch"; + sha256 = "1bghbdvj24jrvb0sqfdif9vwg7wx6pn8dvl6flkrcjkhpj0gi0jg"; + }); + + cmakeFlags = [] + ++ stdenv.lib.optional staticOnly "-DBUILD_SHARED_LIBS=OFF"; outputs = [ "out" "dev" "lib" ]; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 8230d6ea3647..a3aecf88c907 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -5,10 +5,10 @@ stdenv.mkDerivation rec { pname = "zstd"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { - sha256 = "0mmgs98cfh92gcbjyv37vz8nq7x4x7fbzymlxyqd9awwpv9v0i5n"; + sha256 = "0zn7r8d4m8w2lblnjalqpz18na0spzkdiw3fwq2fzb7drhb32v54"; rev = "v${version}"; repo = "zstd"; owner = "facebook"; |