diff options
author | Nick Cao <nickcao@nichi.co> | 2023-11-30 09:16:29 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-30 09:16:29 -0500 |
commit | 0a0fad8fbf4b882a78a3580e22d1e2614cc74fff (patch) | |
tree | 4796fae2dbef71dd68ec6f3dcb7d2fe5a342d96d | |
parent | 64d626bc6ded83efc8a86a5b9aa65d1750f9f6d5 (diff) | |
parent | 064e9dae14313377859a62e789b20f9a20886c5a (diff) |
Merge pull request #271094 from NixOS/backport-270234-to-release-23.11
[Backport release-23.11] bisq-desktop: 1.9.12 -> 1.9.14
-rw-r--r-- | pkgs/applications/blockchains/bisq-desktop/default.nix | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/pkgs/applications/blockchains/bisq-desktop/default.nix b/pkgs/applications/blockchains/bisq-desktop/default.nix index 9560292e1b7ef..8e6881f0d7e85 100644 --- a/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -13,6 +13,7 @@ , tor , zip , xz +, findutils }: let @@ -24,7 +25,9 @@ let # whereas Nix only scans for hashes in uncompressed text. # ${bisq-tor} - JAVA_TOOL_OPTIONS="-XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ${args}" bisq-desktop-wrapped "$@" + classpath=@out@/lib/desktop.jar:@out@/lib/* + + exec "${openjdk11}/bin/java" -Djpackage.app-version=@version@ -XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC -XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication -Djava.net.preferIPv4Stack=true -classpath $classpath ${args} bisq.desktop.app.BisqAppMain "$@" ''; bisq-tor = writeScript "bisq-tor" '' @@ -35,11 +38,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.12"; + version = "1.9.14"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0zzrl7dmd3m7pymwvl68gnjspbpzf1w17bcwr0ipgsszmr35k9rs"; + sha256 = "0xbq94qbp59523xjp80bly38aisfwkfi0y9hmyhf8xlw084b82kz"; }; nativeBuildInputs = [ @@ -50,6 +53,7 @@ stdenv.mkDerivation rec { strip-nondeterminism xz zip + findutils ]; desktopItems = [ @@ -83,24 +87,22 @@ stdenv.mkDerivation rec { mkdir -p native/linux/x64/ cp ${bisq-tor} ./tor tar --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cJf native/linux/x64/tor.tar.xz tor - zip -r opt/bisq/lib/app/desktop-${version}-all.jar native - strip-nondeterminism opt/bisq/lib/app/desktop-${version}-all.jar + tor_jar_file=$(find ./opt/bisq/lib/app -name "tor-binary-linux64-*.jar") + zip -r $tor_jar_file native + strip-nondeterminism ./opt/bisq/lib/app/*.jar ''; installPhase = '' runHook preInstall - mkdir -p $out/lib $out/bin - cp opt/bisq/lib/app/desktop-${version}-all.jar $out/lib - - makeWrapper ${openjdk11}/bin/java $out/bin/bisq-desktop-wrapped \ - --add-flags "-jar $out/lib/desktop-${version}-all.jar bisq.desktop.app.BisqAppMain" + mkdir -p $out $out/bin + cp -r opt/bisq/lib/app $out/lib - makeWrapper ${bisq-launcher ""} $out/bin/bisq-desktop \ - --prefix PATH : $out/bin + install -D -m 777 ${bisq-launcher ""} $out/bin/bisq-desktop + substituteAllInPlace $out/bin/bisq-desktop - makeWrapper ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi \ - --prefix PATH : $out/bin + install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-desktop-hidpi + substituteAllInPlace $out/bin/bisq-desktop-hidpi for n in 16 24 32 48 64 96 128 256; do size=$n"x"$n |