diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-11-25 10:33:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-25 10:33:24 +0100 |
| commit | 03bcf3a0834df6c8dec5bd09c97e99ffaec39466 (patch) | |
| tree | efabe96af63d409284d66eedc052f77b1a74c213 | |
| parent | apache-airflow: 2.4.1 -> 2.4.3 (diff) | |
| parent | wasabiwallet: 2.0.1.3 -> 2.0.2 (diff) | |
| download | nixpkgs-03bcf3a0834df6c8dec5bd09c97e99ffaec39466.tar.gz | |
Merge pull request #202809 from NixOS/backport-202582-to-release-22.11
[Backport release-22.11] wasabiwallet: 2.0.1.3 -> 2.0.2
| -rw-r--r-- | pkgs/applications/blockchains/wasabiwallet/default.nix | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 70c67db31c99..30edd74d031d 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -1,8 +1,11 @@ { lib, stdenv +, autoPatchelfHook +, makeWrapper , fetchurl , makeDesktopItem , curl , dotnetCorePackages +, lttng-ust_2_12 , fontconfig , krb5 , openssl @@ -11,29 +14,31 @@ }: let - dotnet-runtime = dotnetCorePackages.runtime_5_0; - libPath = lib.makeLibraryPath [ + dotnet-runtime = dotnetCorePackages.runtime_6_0; + # These libraries are dynamically loaded by the application, + # and need to be present in LD_LIBRARY_PATH + runtimeLibs = [ curl - dotnet-runtime fontconfig.lib krb5 openssl stdenv.cc.cc.lib xorg.libX11 + xorg.libICE + xorg.libSM zlib ]; in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.1.3"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-cATqg/n4/BDQtuCVjHAx3EfMLmlX5EjeQ01gavy/L8o="; + sha256 = "sha256-0DFl+UFxQckRM2qXFqDpKaRQ5sIMUbNj7l3zKPKAOnQ="; }; dontBuild = true; - dontPatchELF = true; desktopItem = makeDesktopItem { name = "wasabi"; @@ -44,16 +49,19 @@ stdenv.mkDerivation rec { categories = [ "Network" "Utility" ]; }; + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + buildInputs = runtimeLibs ++ [ + lttng-ust_2_12 + ]; + installPhase = '' mkdir -p $out/opt/${pname} $out/bin $out/share/applications cp -Rv . $out/opt/${pname} - cd $out/opt/${pname} - for i in $(find . -type f -name '*.so') wassabee - do - patchelf --set-rpath ${libPath} $i - done - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" wassabee - ln -s $out/opt/${pname}/wassabee $out/bin/${pname} + + makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}" \ + --add-flags "$out/opt/${pname}/WalletWasabi.Fluent.Desktop.dll" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + cp -v $desktopItem/share/applications/* $out/share/applications ''; |