ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 03:59:30 +03:00
Code Issues Projects Releases Wiki Activity

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

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

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