Merge branch 'release/v1.0.x' into release/v1.0.x-export

mmsqe · Aug 25, 2023 · d82f434 · d82f434
2 parents 606b60a + 4565d75
commit d82f434
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/default.nix b/default.nix
@@ -45,7 +45,7 @@ buildGoApplication rec {
  else "-lrocksdb -pthread -lstdc++ -ldl";
 
  postFixup = lib.optionalString stdenv.isDarwin ''
- ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.7.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/cronosd
+ ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.8.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/cronosd
  '';
 
  doCheck = false;

diff --git a/nix/rocksdb.nix b/nix/rocksdb.nix
@@ -81,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{} ${stdenv.cc.bintools.targetPrefix}install_name_tool -change "@rpath/librocksdb.7.dylib" $out/lib/librocksdb.dylib {}
+ ls -1 $tools/bin/* | xargs -I{} ${stdenv.cc.bintools.targetPrefix}install_name_tool -change "@rpath/librocksdb.${lib.versions.major 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 {}
  '';
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
  fi
  '' + lib.optionalString stdenv.isDarwin ''
  ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/libsnappy.1.dylib" "${snappy}/lib/libsnappy.1.dylib" $out/lib/librocksdb.dylib
- ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.7.dylib" "$out/lib/librocksdb.7.dylib" $out/lib/librocksdb.dylib
+ ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.${lib.versions.major version}.dylib" "$out/lib/librocksdb.${lib.versions.major version}.dylib" $out/lib/librocksdb.dylib
  '';
 
  meta = with lib; {