diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2023-11-25 16:38:05 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-25 16:38:05 +0100 |
commit | 911ce27f7ec3742e396928da3ccb25c17566bdfe (patch) | |
tree | 79065b93a6e65e654344a6530457dd4360ef488d /pkgs | |
parent | 6f963568d710870c7a6155b47a864f329519cfd4 (diff) | |
parent | 11e39b43a0772cc4ead0101646e8fd4fd78f32ea (diff) | |
download | nixlib-911ce27f7ec3742e396928da3ccb25c17566bdfe.tar nixlib-911ce27f7ec3742e396928da3ccb25c17566bdfe.tar.gz nixlib-911ce27f7ec3742e396928da3ccb25c17566bdfe.tar.bz2 nixlib-911ce27f7ec3742e396928da3ccb25c17566bdfe.tar.lz nixlib-911ce27f7ec3742e396928da3ccb25c17566bdfe.tar.xz nixlib-911ce27f7ec3742e396928da3ccb25c17566bdfe.tar.zst nixlib-911ce27f7ec3742e396928da3ccb25c17566bdfe.zip |
Merge pull request #269856 from prusnak/rocksdb
rocksdb_6_23, rocksdb_7_10: fix build on newer compilers
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/rocksdb/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index e48c812b3912..c25a349ba32d 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -16,14 +16,14 @@ , sse42Support ? stdenv.hostPlatform.sse4_2Support }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; version = "8.3.2"; src = fetchFromGitHub { owner = "facebook"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; hash = "sha256-mfIRQ8nkUbZ3Bugy3NAvOhcfzFY84J2kBUIUBcQ2/Qg="; }; @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.cc.isClang [ "-Wno-error=unused-private-field" "-faligned-allocation" + ] ++ lib.optionals (lib.versionOlder finalAttrs.version "8") [ + "-Wno-error=unused-but-set-variable" + ] ++ lib.optionals (lib.versionOlder finalAttrs.version "7") [ + "-Wno-error=deprecated-copy" ]); cmakeFlags = [ @@ -77,7 +81,7 @@ stdenv.mkDerivation rec { mkdir -p $tools/bin cp tools/{ldb,sst_dump}${stdenv.hostPlatform.extensions.executable} $tools/bin/ '' + lib.optionalString stdenv.isDarwin '' - ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major version}.dylib" $out/lib/librocksdb.dylib {} + ls -1 $tools/bin/* | xargs -I{} install_name_tool -change "@rpath/librocksdb.${lib.versions.major finalAttrs.version}.dylib" $out/lib/librocksdb.dylib {} '' + lib.optionalString (stdenv.isLinux && enableShared) '' ls -1 $tools/bin/* | xargs -I{} patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib {} ''; @@ -93,9 +97,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; - changelog = "https://github.com/facebook/rocksdb/raw/v${version}/HISTORY.md"; + changelog = "https://github.com/facebook/rocksdb/raw/v${finalAttrs.version}/HISTORY.md"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ adev magenbluten ]; }; -} +}) |