diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix index bb3d0ea440ff..cf8d0db7d115 100644 --- a/pkgs/by-name/wa/wasabiwallet/package.nix +++ b/pkgs/by-name/wa/wasabiwallet/package.nix @@ -27,18 +27,18 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.8.1"; + version = "2.5.1"; src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-9q93C8Q4MKrpvAs6cb4sgo3PDVhk9ZExeHIZ9Qm8P2w="; + url = "https://github.com/WalletWasabi/WalletWasabi/releases/download/v${version}/Wasabi-${version}-linux-x64.tar.gz"; + sha256 = "sha256-DTgxLg8NwjHX085Ai6zxXgjL3x8ZHqVIpvxk/KRl+7w="; }; dontBuild = true; desktopItem = makeDesktopItem { name = "wasabi"; - exec = "wasabiwallet"; + exec = "wasabiwallet-desktop"; desktopName = "Wasabi"; genericName = "Bitcoin wallet"; comment = meta.description; @@ -58,13 +58,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/opt/${pname} $out/bin $out/share/applications - cp -Rv . $out/opt/${pname} - makeWrapper "$out/opt/${pname}/wassabee" "$out/bin/${pname}" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + # The weird path is an upstream packaging error and could be fixed in the upcoming release + cp -Rv ./runner/work/WalletWasabi/WalletWasabi/build/linux-x64/* $out/opt/${pname} - makeWrapper "$out/opt/${pname}/wassabeed" "$out/bin/${pname}d" \ - --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + for nameMap in "wassabee:desktop" "wassabeed:daemon" "wcoordinator:coordinator" "wbackend:backend"; do + IFS=":" read -r filename wrappedname <<< "$nameMap" + makeWrapper "$out/opt/${pname}/$filename" "$out/bin/${pname}-$wrappedname" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + done cp -v $desktopItem/share/applications/* $out/share/applications '';