From c5af608dd2bcc3a7c8e13785c3a0968993099dee Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 3 Jul 2018 14:16:02 +0200 Subject: [PATCH] electron-cash: 3.1.6 -> 3.3 --- pkgs/applications/misc/electron-cash/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 891222a0f10..64a284cd0ed 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -7,14 +7,14 @@ let in python3Packages.buildPythonApplication rec { - version = "3.1.6"; + version = "3.3"; name = "electron-cash-${version}"; src = fetchurl { url = "https://electroncash.org/downloads/${version}/win-linux/ElectronCash-${version}.tar.gz"; # Verified using official SHA-1 and signature from # https://github.com/fyookball/keys-n-hashes - sha256 = "062k5iw0jcp10zxrffvgiyfg51c5xzs7gmm638icx01yy67d58dm"; + sha256 = "1x487hyacdm1qhik1mhfimr4jwcwz7sgsbkh11awrb6j19sxdxym"; }; propagatedBuildInputs = with python3Packages; [ @@ -42,7 +42,6 @@ python3Packages.buildPythonApplication rec { ''; preBuild = '' - sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py pyrcc5 icons.qrc -o gui/qt/icons_rc.py # Recording the creation timestamps introduces indeterminism to the build sed -i '/Created: .*/d' gui/qt/icons_rc.py @@ -51,10 +50,9 @@ python3Packages.buildPythonApplication rec { doCheck = false; postInstall = '' - # Despite setting usr_share above, these files are installed under - # $out/nix ... - mv $out/${python.sitePackages}/nix/store"/"*/share $out - rm -rf $out/${python.sitePackages}/nix + # These files are installed under $out/homeless-shelter ... + mv $out/${python.sitePackages}/homeless-shelter/.local/share $out + rm -rf $out/${python.sitePackages}/homeless-shelter substituteInPlace $out/share/applications/electron-cash.desktop \ --replace "Exec=electron-cash %u" "Exec=$out/bin/electron-cash %u"