diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-08 00:46:04 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:13:21 +0000 |
| commit | afcf2d55332c5c01c2d989e9d010577d257cb6cc (patch) | |
| tree | e1c816a271686b014a6403bcad7c57dd2ee4d9c7 /nixpkgs/pkgs/development/libraries/rocksdb | |
| parent | 175b9acd282aaf65b5f354ea6e95c1348fe3daa3 (diff) | |
| parent | 4e60699fa727e4a0f9a3e78948012f86da32cfef (diff) | |
| download | nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.gz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.bz2 nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.lz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.xz nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.tar.zst nixlib-afcf2d55332c5c01c2d989e9d010577d257cb6cc.zip | |
Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/rocksdb')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/rocksdb/default.nix | 8 |
2 files changed, 5 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch b/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch deleted file mode 100644 index eb532620773e..000000000000 --- a/nixpkgs/pkgs/development/libraries/rocksdb/0001-findzlib.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 132d3b0..37fec63 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -92,7 +92,7 @@ else() - endif() - - if(WITH_ZLIB) -- find_package(zlib REQUIRED) -+ find_package(ZLIB REQUIRED) - add_definitions(-DZLIB) - if(ZLIB_INCLUDE_DIRS) - # CMake 3 diff --git a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 05ecf0f8f257..1b6b5b1b57bf 100644 --- a/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -2,19 +2,21 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.1.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "0gy2zjga3r8k9pbn2b0b5fzv4m0h2ip3zmyja1i7fli9n56civ3y"; + sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ]; - patches = [ ./0001-findzlib.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB " + ''; cmakeFlags = [ "-DPORTABLE=1" |