about summary refs log tree commit diff
path: root/pkgs/development/libraries/leveldb
diff options
context:
space:
mode:
authorDaniƫl de Kok <me@github.danieldk.eu>2018-11-02 00:13:43 +0100
committerxeji <36407913+xeji@users.noreply.github.com>2018-11-02 00:13:43 +0100
commit3f0fa6296a52d5513f86659f4b7d1813a0e59fee (patch)
tree404a6ed49595afd5b22b1fee2ed0a9ff7fe11e01 /pkgs/development/libraries/leveldb
parent1a91d50ff2b621d5ea91d88f66acad7072c87dd3 (diff)
downloadnixlib-3f0fa6296a52d5513f86659f4b7d1813a0e59fee.tar
nixlib-3f0fa6296a52d5513f86659f4b7d1813a0e59fee.tar.gz
nixlib-3f0fa6296a52d5513f86659f4b7d1813a0e59fee.tar.bz2
nixlib-3f0fa6296a52d5513f86659f4b7d1813a0e59fee.tar.lz
nixlib-3f0fa6296a52d5513f86659f4b7d1813a0e59fee.tar.xz
nixlib-3f0fa6296a52d5513f86659f4b7d1813a0e59fee.tar.zst
nixlib-3f0fa6296a52d5513f86659f4b7d1813a0e59fee.zip
leveldb: 1.18 -> 1.20 (#49587)
Changelog:

1.20: https://github.com/google/leveldb/releases/tag/v1.20
1.19: https://github.com/google/leveldb/releases/tag/v1.19
Diffstat (limited to 'pkgs/development/libraries/leveldb')
-rw-r--r--pkgs/development/libraries/leveldb/default.nix13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix
index 2b50c09af5cc..c459a4048e45 100644
--- a/pkgs/development/libraries/leveldb/default.nix
+++ b/pkgs/development/libraries/leveldb/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "leveldb-${version}";
-  version = "1.18";
+  version = "1.20";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "leveldb";
     rev = "v${version}";
-    sha256 = "1bnsii47vbyqnbah42qgq6pbmmcg4k3fynjnw7whqfv6lpdgmb8d";
+    sha256 = "01kxga1hv4wp94agx5vl3ybxfw5klqrdsrb6p6ywvnjmjxm8322y";
   };
 
   buildPhase = ''
-    make all leveldbutil libmemenv.a
+    make all
   '';
 
   installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
-    for file in *.dylib*; do
+    for file in out-shared/*.dylib*; do
       install_name_tool -id $out/lib/$file $file
     done
   '') + # XXX consider removing above after transition to cmake in the next release
@@ -27,9 +27,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include/leveldb/helpers
     cp helpers/memenv/memenv.h $out/include/leveldb/helpers
 
-    cp lib* $out/lib
+    cp out-shared/lib* $out/lib
+    cp out-static/lib* $out/lib
 
-    cp leveldbutil $out/bin
+    cp out-static/leveldbutil $out/bin
   ";
 
   meta = with stdenv.lib; {