From 3f0fa6296a52d5513f86659f4b7d1813a0e59fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 2 Nov 2018 00:13:43 +0100 Subject: [PATCH] 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 --- pkgs/development/libraries/leveldb/default.nix | 13 +++++++------ 1 file 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; {