From d41aca6ea929dbed629c37c315434b649e173f4d Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sun, 4 Dec 2022 14:12:39 -0500 Subject: [PATCH] sparrow: 1.7.0 -> 1.7.1 (#201321) --- pkgs/applications/blockchains/sparrow/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index 9a184bed83a5..85d5abdd178c 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -5,7 +5,7 @@ , makeDesktopItem , copyDesktopItems , autoPatchelfHook -, openjdk18 +, openjdk , gtk3 , gsettings-desktop-schemas , writeScript @@ -20,11 +20,11 @@ let pname = "sparrow"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "1rrf5xba733c2vxgd7bf164iswc66ggp64ywh79d0vf188imzmwr"; + sha256 = "0q31b4ncvbhr9gb47wplphg43pwlg5vpd1b12qiidqlrkgm2vjy8"; }; launcher = writeScript "sparrow" '' @@ -60,7 +60,7 @@ let -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 ${openjdk18}/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 ${openjdk}/bin/java ''${params[@]} $@ ''; torWrapper = writeScript "tor-wrapper" '' @@ -71,14 +71,14 @@ let jdk-modules = stdenv.mkDerivation { name = "jdk-modules"; - nativeBuildInputs = [ openjdk18 ]; + nativeBuildInputs = [ openjdk ]; dontUnpack = true; buildPhase = '' # Extract the JDK's JIMAGE and generate a list of modules. mkdir modules pushd modules - jimage extract ${openjdk18}/lib/openjdk/lib/modules + jimage extract ${openjdk}/lib/openjdk/lib/modules ls | xargs -d " " -- echo > ../manifest.txt popd ''; @@ -93,7 +93,7 @@ let sparrow-modules = stdenv.mkDerivation { pname = "sparrow-modules"; inherit version src; - nativeBuildInputs = [ makeWrapper gnugrep openjdk18 autoPatchelfHook stdenv.cc.cc.lib zlib ]; + nativeBuildInputs = [ makeWrapper gnugrep openjdk autoPatchelfHook stdenv.cc.cc.lib zlib ]; buildPhase = '' # Extract Sparrow's JIMAGE and generate a list of them.