cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #240319 from emmanuelrosa/sparrow-1.7.7

Browse source 
Sparrow: 1.7.6 -> 1.7.7
This commit is contained in:
Weijia Wang 2023-06-29 10:43:10 +03:00 committed by GitHub
commit 3fc7125d25
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/applications/blockchains/sparrow/default.nix
View file

@ -21,11 +21,11 @@
let let
pname = "sparrow"; pname = "sparrow";
version = "1.7.6"; version = "1.7.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
sha256 = "01ksl790i8swvj8nvl2r27bbd8kad80shsbw3di39925841dp8z3"; sha256 = "07mgh6xjj8i4d2pvwldl2y586y4fw9ir0rzxr97bh379fdcfqfxa";
}; };
launcher = writeScript "sparrow" '' launcher = writeScript "sparrow" ''
@ -47,9 +47,11 @@ let
--add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx --add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx
--add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx --add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx
--add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow --add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow
--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow
--add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow --add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow
--add-opens java.base/java.net=com.sparrowwallet.sparrow --add-opens java.base/java.net=com.sparrowwallet.sparrow
--add-opens java.base/java.io=com.google.gson --add-opens java.base/java.io=com.google.gson
--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow
--add-reads com.sparrowwallet.merged.module=java.desktop --add-reads com.sparrowwallet.merged.module=java.desktop
--add-reads com.sparrowwallet.merged.module=java.sql --add-reads com.sparrowwallet.merged.module=java.sql
--add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow --add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow
@ -165,9 +167,9 @@ stdenv.mkDerivation rec {
desktopItems = [ desktopItems = [
(makeDesktopItem { (makeDesktopItem {
name = "Sparrow"; name = "sparrow-desktop";
exec = pname; exec = "sparrow-desktop";
icon = pname; icon = "sparrow-desktop";
desktopName = "Sparrow Bitcoin Wallet"; desktopName = "Sparrow Bitcoin Wallet";
genericName = "Bitcoin Wallet"; genericName = "Bitcoin Wallet";
categories = [ "Finance" "Network" ]; categories = [ "Finance" "Network" ];
@ -185,7 +187,7 @@ stdenv.mkDerivation rec {
for n in 16 24 32 48 64 96 128 256; do for n in 16 24 32 48 64 96 128 256; do
size=$n"x"$n size=$n"x"$n
mkdir -p $out/hicolor/$size/apps mkdir -p $out/hicolor/$size/apps
convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow.png convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow-desktop.png
done; done;
''; '';
}; };
@ -195,9 +197,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out mkdir -p $out/bin $out
ln -s ${sparrow-modules}/modules $out/lib ln -s ${sparrow-modules}/modules $out/lib
install -D -m 777 ${launcher} $out/bin/sparrow install -D -m 777 ${launcher} $out/bin/sparrow-desktop
substituteAllInPlace $out/bin/sparrow substituteAllInPlace $out/bin/sparrow-desktop
substituteInPlace $out/bin/sparrow --subst-var-by jdkModules ${jdk-modules} substituteInPlace $out/bin/sparrow-desktop --subst-var-by jdkModules ${jdk-modules}
mkdir -p $out/share/icons mkdir -p $out/share/icons
ln -s ${sparrow-icons}/hicolor $out/share/icons ln -s ${sparrow-icons}/hicolor $out/share/icons
@ -220,5 +222,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ emmanuelrosa _1000101 ]; maintainers = with maintainers; [ emmanuelrosa _1000101 ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
mainProgram = "sparrow-desktop";
}; };
} }

4
pkgs/applications/blockchains/sparrow/fhsenv.nix
View file

@ -4,9 +4,9 @@
}: }:
buildFHSEnv { buildFHSEnv {
name = "sparrow"; name = "sparrow-desktop";
runScript = "${sparrow-unwrapped}/bin/sparrow"; runScript = "${sparrow-unwrapped}/bin/sparrow-desktop";
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
sparrow-unwrapped sparrow-unwrapped