mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Code Issues Wiki Activity

Merge pull request #66253 from magenbluten/rocksdb

Browse source 
rocksdb: 6.1.2 -> 6.2.2
This commit is contained in:
Samuel Leathers 2019-08-30 23:04:43 -04:00 committed by GitHub
parent 6baeab2042 7ea1d15fc0
commit 41a3746a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/rocksdb/0001-findzlib.patch
View file

@ -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

8
pkgs/development/libraries/rocksdb/default.nix
View file

@ -2,19 +2,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rocksdb"; pname = "rocksdb";
version = "6.1.2"; version = "6.2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "facebook"; owner = "facebook";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0gy2zjga3r8k9pbn2b0b5fzv4m0h2ip3zmyja1i7fli9n56civ3y"; sha256 = "0wz9rfj8gk6gyabh9anl67fqm5dw2z866y1a0k0j2lmcaag537r2";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ bzip2 lz4 snappy zlib zstd ]; buildInputs = [ bzip2 lz4 snappy zlib zstd ];
patches = [ ./0001-findzlib.patch ]; postPatch = ''
substituteInPlace CMakeLists.txt --replace "find_package(zlib " "find_package(ZLIB "
'';
cmakeFlags = [ cmakeFlags = [
"-DPORTABLE=1" "-DPORTABLE=1"