public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

electron-cash: 4.1.0 -> 4.1.1

Browse Source 
Remove included upstream patches. Use qt5.15 (#99956). Spare double
wrapping by using `makeWrapperArgs+=()`.
This commit is contained in:
Doron Behar 2020-10-08 10:57:05 +03:00 committed by Frederik Rietdijk
parent f3e5c93d03
commit 2edd4edcb9
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/misc/electron-cash/default.nix
View File

@ -3,13 +3,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "electron-cash"; pname = "electron-cash";
version = "4.1.0"; version = "4.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Electron-Cash"; owner = "Electron-Cash";
repo = "Electron-Cash"; repo = "Electron-Cash";
rev = version; rev = version;
sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2"; sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm";
}; };
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
@ -36,15 +36,6 @@ python3Packages.buildPythonApplication rec {
nativeBuildInputs = [ wrapQtAppsHook ]; 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 = '' postPatch = ''
substituteInPlace contrib/requirements/requirements.txt \ substituteInPlace contrib/requirements/requirements.txt \
--replace "qdarkstyle==2.6.8" "qdarkstyle<3" --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. # Electron Cash was unable to find the secp256k1 library on this system.
# Elliptic curve cryptography operations will be performed in slow # Elliptic curve cryptography operations will be performed in slow
# Python-only mode. # Python-only mode.
postFixup = '' preFixup = ''
wrapQtApp $out/bin/electron-cash \ makeWrapperArgs+=("''${qtWrapperArgs[@]}")
--prefix LD_LIBRARY_PATH : ${secp256k1}/lib makeWrapperArgs+=(
"--prefix" "LD_LIBRARY_PATH" ":" "${secp256k1}/lib"
)
''; '';
doInstallCheck = true; doInstallCheck = true;

2
pkgs/top-level/all-packages.nix
View File

@ -20308,7 +20308,7 @@ in
ekho = callPackage ../applications/audio/ekho { }; ekho = callPackage ../applications/audio/ekho { };
electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
electrum = libsForQt5.callPackage ../applications/misc/electrum { }; electrum = libsForQt5.callPackage ../applications/misc/electrum { };