nixpatches: remove custom zecwallet-lite patch and point upstream instead
This commit is contained in:
parent
ed98b1702a
commit
5a4dd3b38d
|
@ -1,49 +0,0 @@
|
|||
diff --git a/pkgs/applications/blockchains/zecwallet-lite/default.nix b/pkgs/applications/blockchains/zecwallet-lite/default.nix
|
||||
new file mode 100644
|
||||
index 00000000000..2a15d2fa923
|
||||
--- /dev/null
|
||||
+++ b/pkgs/applications/blockchains/zecwallet-lite/default.nix
|
||||
@@ -0,0 +1,30 @@
|
||||
+{ lib, fetchurl, appimageTools }:
|
||||
+
|
||||
+appimageTools.wrapType2 rec {
|
||||
+ pname = "zecwallet-lite";
|
||||
+ version = "1.7.13";
|
||||
+
|
||||
+ src = fetchurl {
|
||||
+ url = "https://github.com/adityapk00/zecwallet-lite/releases/download/v${version}/Zecwallet.Lite-${version}.AppImage";
|
||||
+ hash = "sha256-uBiLGHBgm0vurfvOJjJ+RqVoGnVccEHTFO2T7LDqUzU=";
|
||||
+ };
|
||||
+
|
||||
+ extraInstallCommands =
|
||||
+ let contents = appimageTools.extract { inherit pname version src; };
|
||||
+ in ''
|
||||
+ mv $out/bin/${pname}-${version} $out/bin/${pname}
|
||||
+
|
||||
+ install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
|
||||
+ substituteInPlace $out/share/applications/${pname}.desktop \
|
||||
+ --replace 'Exec=AppRun' 'Exec=${pname}'
|
||||
+ cp -r ${contents}/usr/share/icons $out/share
|
||||
+ '';
|
||||
+
|
||||
+ meta = with lib; {
|
||||
+ description = "A fully featured shielded wallet for Zcash";
|
||||
+ homepage = "https://www.zecwallet.co/";
|
||||
+ license = licenses.mit;
|
||||
+ maintainers = with maintainers; [ colinsane ];
|
||||
+ platforms = [ "x86_64-linux" ];
|
||||
+ };
|
||||
+}
|
||||
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||||
index 1c384a14b81..a7955f27117 100644
|
||||
--- a/pkgs/top-level/all-packages.nix
|
||||
+++ b/pkgs/top-level/all-packages.nix
|
||||
@@ -31776,6 +31776,8 @@ with pkgs;
|
||||
|
||||
zcash = callPackage ../applications/blockchains/zcash { };
|
||||
|
||||
+ zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { };
|
||||
+
|
||||
lightwalletd = callPackage ../applications/blockchains/lightwalletd { };
|
||||
|
||||
openethereum = callPackage ../applications/blockchains/openethereum { };
|
|
@ -18,8 +18,11 @@ fetchpatch: [
|
|||
|
||||
# TODO: upstream
|
||||
./07-duplicity-rich-url.patch
|
||||
# TODO: upstream
|
||||
./08-zecwallet-lite.patch
|
||||
# zecwallet-lite: init at 1.7.13
|
||||
(fetchpatch {
|
||||
url = "https://github.com/NixOS/nixpkgs/pull/180960.diff";
|
||||
sha256 = "sha256-HVVj/T3yQtjYBoxXpoPiG9Zar/eik9IoDVDhTOehBdY=";
|
||||
})
|
||||
# upstream PR: https://github.com/NixOS/nixpkgs/pull/188342
|
||||
./09-makemkv-1.17.1.patch
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue
Block a user