From 3f9876a253ac7f05d146b6e341b5285816a4d8c4 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 4 Apr 2018 03:23:24 +0200 Subject: rocksdb_lite: Fix --- pkgs/development/libraries/rocksdb/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/rocksdb/default.nix') diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index fc8a18cfc38f..7178c4f3e114 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq"; }; - + nativeBuildInputs = [ which perl ]; buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ]; @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { CMAKE_CXX_FLAGS = "-std=gnu++11"; JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc"; - ${if enableLite then "LIBNAME" else null} = "librocksdb_lite"; + LIBNAME = "librocksdb${stdenv.lib.optionalString enableLite "_lite"}"; ${if enableLite then "CXXFLAGS" else null} = "-DROCKSDB_LITE=1"; - + buildAndInstallFlags = [ "USE_RTTI=1" "DEBUG_LEVEL=0" - "DISABLE_WARNING_AS_ERROR=1" + "DISABLE_WARNING_AS_ERROR=1" ]; buildFlags = buildAndInstallFlags ++ [ @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { echo "BUILD CONFIGURATION FOR SANITY CHECKING" cat make_config.mk mkdir -pv $static/lib/ - mv -vi $out/lib/librocksdb.a $static/lib/ + mv -vi $out/lib/${LIBNAME}.a $static/lib/ ''; enableParallelBuilding = true; -- cgit 1.4.1