sparrow: 1.6.5 -> 1.7.0
This commit is contained in:
parent
22aa6dcbac
commit
2e318e05ce
1 changed files with 9 additions and 8 deletions
|
@ -5,7 +5,7 @@
|
||||||
, makeDesktopItem
|
, makeDesktopItem
|
||||||
, copyDesktopItems
|
, copyDesktopItems
|
||||||
, autoPatchelfHook
|
, autoPatchelfHook
|
||||||
, openjdk17
|
, openjdk18
|
||||||
, gtk3
|
, gtk3
|
||||||
, gsettings-desktop-schemas
|
, gsettings-desktop-schemas
|
||||||
, writeScript
|
, writeScript
|
||||||
|
@ -20,11 +20,11 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
pname = "sparrow";
|
pname = "sparrow";
|
||||||
version = "1.6.5";
|
version = "1.7.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}.tar.gz";
|
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
|
||||||
sha256 = "0zk33w664fky3ir6cqm6walc80fjhg9s0hnrllrc2hrxrqnrn88p";
|
sha256 = "1rrf5xba733c2vxgd7bf164iswc66ggp64ywh79d0vf188imzmwr";
|
||||||
};
|
};
|
||||||
|
|
||||||
launcher = writeScript "sparrow" ''
|
launcher = writeScript "sparrow" ''
|
||||||
|
@ -60,7 +60,7 @@ let
|
||||||
-m com.sparrowwallet.sparrow
|
-m com.sparrowwallet.sparrow
|
||||||
)
|
)
|
||||||
|
|
||||||
XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk17}/bin/java ''${params[@]} $@
|
XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS ${openjdk18}/bin/java ''${params[@]} $@
|
||||||
'';
|
'';
|
||||||
|
|
||||||
torWrapper = writeScript "tor-wrapper" ''
|
torWrapper = writeScript "tor-wrapper" ''
|
||||||
|
@ -71,14 +71,14 @@ let
|
||||||
|
|
||||||
jdk-modules = stdenv.mkDerivation {
|
jdk-modules = stdenv.mkDerivation {
|
||||||
name = "jdk-modules";
|
name = "jdk-modules";
|
||||||
nativeBuildInputs = [ openjdk17 ];
|
nativeBuildInputs = [ openjdk18 ];
|
||||||
dontUnpack = true;
|
dontUnpack = true;
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
# Extract the JDK's JIMAGE and generate a list of modules.
|
# Extract the JDK's JIMAGE and generate a list of modules.
|
||||||
mkdir modules
|
mkdir modules
|
||||||
pushd modules
|
pushd modules
|
||||||
jimage extract ${openjdk17}/lib/openjdk/lib/modules
|
jimage extract ${openjdk18}/lib/openjdk/lib/modules
|
||||||
ls | xargs -d " " -- echo > ../manifest.txt
|
ls | xargs -d " " -- echo > ../manifest.txt
|
||||||
popd
|
popd
|
||||||
'';
|
'';
|
||||||
|
@ -93,7 +93,7 @@ let
|
||||||
sparrow-modules = stdenv.mkDerivation {
|
sparrow-modules = stdenv.mkDerivation {
|
||||||
pname = "sparrow-modules";
|
pname = "sparrow-modules";
|
||||||
inherit version src;
|
inherit version src;
|
||||||
nativeBuildInputs = [ makeWrapper gnugrep openjdk17 autoPatchelfHook stdenv.cc.cc.lib zlib ];
|
nativeBuildInputs = [ makeWrapper gnugrep openjdk18 autoPatchelfHook stdenv.cc.cc.lib zlib ];
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
# Extract Sparrow's JIMAGE and generate a list of them.
|
# Extract Sparrow's JIMAGE and generate a list of them.
|
||||||
|
@ -187,6 +187,7 @@ stdenv.mkDerivation rec {
|
||||||
desktopName = "Sparrow Bitcoin Wallet";
|
desktopName = "Sparrow Bitcoin Wallet";
|
||||||
genericName = "Bitcoin Wallet";
|
genericName = "Bitcoin Wallet";
|
||||||
categories = [ "Finance" ];
|
categories = [ "Finance" ];
|
||||||
|
mimeTypes = [ "application/psbt" "application/bitcoin-transaction" "x-scheme-handler/bitcoin" "x-scheme-handler/auth47" "x-scheme-handler/lightning" ];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue