From e59e74643cd26ce7258ca89f2a7be913ae537a14 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Thu, 10 Aug 2023 09:44:59 +0800 Subject: [PATCH 1/3] fix librocksdb version --- default.nix | 2 +- nix/rocksdb.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 6e7715118..303fa0568 100644 --- a/default.nix +++ b/default.nix @@ -70,7 +70,7 @@ buildGoApplication rec { -X github.com/cosmos/cosmos-sdk/version.BuildTags=${concatStringsSep "," tags} ''; postFixup = lib.optionalString stdenv.isDarwin '' - ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.7.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/chain-maind + ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.8.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/chain-maind ''; passthru = { # update script use the same golang version as the project diff --git a/nix/rocksdb.nix b/nix/rocksdb.nix index 8bcbc3506..5ffab6a26 100644 --- 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.8.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.8.dylib" "$out/lib/librocksdb.8.dylib" $out/lib/librocksdb.dylib ''; meta = with lib; { From 260a78209d3b1ff028cd7b5d85d2529dc529f488 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Fri, 11 Aug 2023 16:50:03 +0800 Subject: [PATCH 2/3] Apply suggestions from code review --- default.nix | 2 +- nix/rocksdb.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/default.nix b/default.nix index 303fa0568..26231f2bf 100644 --- a/default.nix +++ b/default.nix @@ -70,7 +70,7 @@ buildGoApplication rec { -X github.com/cosmos/cosmos-sdk/version.BuildTags=${concatStringsSep "," tags} ''; postFixup = lib.optionalString stdenv.isDarwin '' - ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.8.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/chain-maind + ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.${lib.versions.major version}.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/chain-maind ''; passthru = { # update script use the same golang version as the project diff --git a/nix/rocksdb.nix b/nix/rocksdb.nix index 5ffab6a26..488f56917 100644 --- 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.8.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.8.dylib" "$out/lib/librocksdb.8.dylib" $out/lib/librocksdb.dylib + ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.${lib.versions.major version}.dylib" "$out/lib/librocksdb.8.dylib" $out/lib/librocksdb.dylib ''; meta = with lib; { From 48573d2a83f2b9a7ecb4705aef0db2f54a93e815 Mon Sep 17 00:00:00 2001 From: mmsqe Date: Fri, 11 Aug 2023 22:50:00 +0800 Subject: [PATCH 3/3] revert default.nix --- default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/default.nix b/default.nix index 26231f2bf..303fa0568 100644 --- a/default.nix +++ b/default.nix @@ -70,7 +70,7 @@ buildGoApplication rec { -X github.com/cosmos/cosmos-sdk/version.BuildTags=${concatStringsSep "," tags} ''; postFixup = lib.optionalString stdenv.isDarwin '' - ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.${lib.versions.major version}.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/chain-maind + ${stdenv.cc.targetPrefix}install_name_tool -change "@rpath/librocksdb.8.dylib" "${rocksdb}/lib/librocksdb.dylib" $out/bin/chain-maind ''; passthru = { # update script use the same golang version as the project