diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-10-08 10:57:05 +0300 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-10-08 18:57:23 +0200 |
commit | 2edd4edcb9fd581ed3e545b4b885683af9df755f (patch) | |
tree | 49a5d92be4bfc3b86b5481a78309ffa4059cec12 /pkgs/applications/misc/electron-cash | |
parent | f3e5c93d03097b7d87d43fcceda330306ed4bc04 (diff) | |
download | nixpkgs-2edd4edcb9fd581ed3e545b4b885683af9df755f.tar nixpkgs-2edd4edcb9fd581ed3e545b4b885683af9df755f.tar.gz nixpkgs-2edd4edcb9fd581ed3e545b4b885683af9df755f.tar.bz2 nixpkgs-2edd4edcb9fd581ed3e545b4b885683af9df755f.tar.lz nixpkgs-2edd4edcb9fd581ed3e545b4b885683af9df755f.tar.xz nixpkgs-2edd4edcb9fd581ed3e545b4b885683af9df755f.tar.zst nixpkgs-2edd4edcb9fd581ed3e545b4b885683af9df755f.zip |
electron-cash: 4.1.0 -> 4.1.1
Remove included upstream patches. Use qt5.15 (#99956). Spare double wrapping by using `makeWrapperArgs+=()`.
Diffstat (limited to 'pkgs/applications/misc/electron-cash')
-rw-r--r-- | pkgs/applications/misc/electron-cash/default.nix | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index a6ba3444dcd..12362823cc5 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -3,13 +3,13 @@ python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2"; + sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm"; }; propagatedBuildInputs = with python3Packages; [ @@ -36,15 +36,6 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapQtAppsHook ]; - patches = [ - # Patch a failed test, this can be removed in next version - (fetchpatch { - url = - "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch"; - sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk"; - }) - ]; - postPatch = '' substituteInPlace contrib/requirements/requirements.txt \ --replace "qdarkstyle==2.6.8" "qdarkstyle<3" @@ -70,9 +61,11 @@ python3Packages.buildPythonApplication rec { # Electron Cash was unable to find the secp256k1 library on this system. # Elliptic curve cryptography operations will be performed in slow # Python-only mode. - postFixup = '' - wrapQtApp $out/bin/electron-cash \ - --prefix LD_LIBRARY_PATH : ${secp256k1}/lib + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + makeWrapperArgs+=( + "--prefix" "LD_LIBRARY_PATH" ":" "${secp256k1}/lib" + ) ''; doInstallCheck = true; |