From 582e30fb299b5fdf078db0a7029cb2e7261d0171 Mon Sep 17 00:00:00 2001 From: Lucas Ontivero Date: Mon, 28 Aug 2023 13:25:37 -0300 Subject: [PATCH 1/2] wasabiwallet: 2.0.3 -> 2.0.4 --- pkgs/applications/blockchains/wasabiwallet/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 72865deb116a..6cb29b28a72f 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-RlWaeOK6XqxyCIQQp1/X6iG9t7f3ER5K+S3ZvPg6wBg="; + sha256 = "sha256-VYyf9rKBRPpnxuaeO6aAq7cQwDfBRLRbH4SlPS+bxFQ="; }; dontBuild = true; @@ -62,6 +62,10 @@ stdenv.mkDerivation rec { --add-flags "$out/opt/${pname}/WalletWasabi.Fluent.Desktop.dll" \ --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}d" \ + --add-flags "$out/opt/${pname}/WalletWasabi.Daemon.dll" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + cp -v $desktopItem/share/applications/* $out/share/applications ''; From cb498323ae2bf73e8047889691afcb3fec4028b7 Mon Sep 17 00:00:00 2001 From: Lucas Ontivero Date: Mon, 28 Aug 2023 14:29:02 -0300 Subject: [PATCH 2/2] Remove dotnet dependency --- .../blockchains/wasabiwallet/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 6cb29b28a72f..d6315d233b9e 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -3,24 +3,18 @@ , makeWrapper , fetchurl , makeDesktopItem -, curl -, dotnetCorePackages , lttng-ust_2_12 , fontconfig -, krb5 , openssl , xorg , zlib }: let - 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 fontconfig.lib - krb5 openssl stdenv.cc.cc.lib xorg.libX11 @@ -58,12 +52,10 @@ stdenv.mkDerivation rec { mkdir -p $out/opt/${pname} $out/bin $out/share/applications cp -Rv . $out/opt/${pname} - makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}" \ - --add-flags "$out/opt/${pname}/WalletWasabi.Fluent.Desktop.dll" \ + makeWrapper "$out/opt/${pname}/wassabee" "$out/bin/${pname}" \ --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" - makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}d" \ - --add-flags "$out/opt/${pname}/WalletWasabi.Daemon.dll" \ + makeWrapper "$out/opt/${pname}/wassabeed" "$out/bin/${pname}d" \ --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" cp -v $desktopItem/share/applications/* $out/share/applications