diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-08-06 12:54:15 +0200 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2022-08-06 13:39:31 +0200 |
| commit | 7e0b4ddbe3cff353211d0753bb63a2cb831d00f0 (patch) | |
| tree | 3f36179584ca9a6eab3ae1c0c9d0ffac1d1d9af4 /pkgs/applications/misc/electrum/default.nix | |
| parent | c85e56bb060291eac3fb3c75d4e0e64f6836fcfe (diff) | |
| download | nixpkgs-7e0b4ddbe3cff353211d0753bb63a2cb831d00f0.tar nixpkgs-7e0b4ddbe3cff353211d0753bb63a2cb831d00f0.tar.gz nixpkgs-7e0b4ddbe3cff353211d0753bb63a2cb831d00f0.tar.bz2 nixpkgs-7e0b4ddbe3cff353211d0753bb63a2cb831d00f0.tar.lz nixpkgs-7e0b4ddbe3cff353211d0753bb63a2cb831d00f0.tar.xz nixpkgs-7e0b4ddbe3cff353211d0753bb63a2cb831d00f0.tar.zst nixpkgs-7e0b4ddbe3cff353211d0753bb63a2cb831d00f0.zip | |
electrum: 4.2.2 -> 4.3.0
- remove no longer necessary usr_share hacks
Diffstat (limited to 'pkgs/applications/misc/electrum/default.nix')
| -rw-r--r-- | pkgs/applications/misc/electrum/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 025d89e4138..4a506aed9e1 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -21,7 +21,7 @@ }: let - version = "4.2.2"; + version = "4.3.0"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -30,6 +30,7 @@ let libzbar_name = if stdenv.isLinux then "libzbar.so.0" + else if stdenv.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -37,7 +38,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo="; + sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg="; postFetch = '' mv $out ./all @@ -53,7 +54,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs="; + sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw="; }; postUnpack = '' @@ -90,7 +91,6 @@ python3.pkgs.buildPythonApplication { ]; preBuild = '' - sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py substituteInPlace ./electrum/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' @@ -101,17 +101,11 @@ python3.pkgs.buildPythonApplication { ''); postInstall = lib.optionalString stdenv.isLinux '' - # Despite setting usr_share above, these files are installed under - # $out/nix ... - mv $out/${python3.sitePackages}/nix/store"/"*/share $out - rm -rf $out/${python3.sitePackages}/nix - substituteInPlace $out/share/applications/electrum.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ "Exec=$out/bin/electrum %u" \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \ "Exec=$out/bin/electrum --testnet %u" - ''; postFixup = lib.optionalString enableQt '' |