electron-cash: 4.1.0 -> 4.1.1
Remove included upstream patches. Use qt5.15 (#99956). Spare double wrapping by using `makeWrapperArgs+=()`.
This commit is contained in:
parent
f3e5c93d03
commit
2edd4edcb9
|
@ -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;
|
||||
|
|
|
@ -20308,7 +20308,7 @@ in
|
|||
|
||||
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 { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue