ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

webtorrent_desktop: use electron 27

Browse Source
This commit is contained in:
Herwig Hochleitner 2023-10-28 13:17:18 +02:00
parent 3655645e4c
commit 97dd4e7f4f
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/video/webtorrent_desktop/default.nix
View File

@ -1,15 +1,27 @@
{ lib, stdenv, electron_22, buildNpmPackage, fetchFromGitHub }: { lib, stdenv, electron, buildNpmPackage, fetchFromGitHub, fetchpatch }:
buildNpmPackage { buildNpmPackage {
pname = "webtorrent-desktop"; pname = "webtorrent-desktop";
version = "0.25-pre"; version = "0.25-pre-1eb612";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "webtorrent"; owner = "webtorrent";
repo = "webtorrent-desktop"; repo = "webtorrent-desktop";
rev = "fce078defefd575cb35a5c79d3d9f96affc8a08f"; rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c";
sha256 = "sha256-gXFiG36qqR0QHTqhaxgQKDO0UCHkJLnVwUTQB/Nct/c="; sha256 = "sha256-DBEFOamncyidMXypvKNnUmDIPUq1LzYjDgox7fa4+Gg=";
}; };
npmDepsHash = "sha256-pEuvstrZ9oMdJ/iU6XwEQ1BYOyQp/ce6sYBTrMCjGMc="; patches = [
# electron 27 fix
(fetchpatch {
url = "https://github.com/webtorrent/webtorrent-desktop/pull/2388.patch";
hash = "sha256-gam5oAZtsaiCNFwecA5ff0nhraySLx3SOHlb/js+cPM=";
})
# startup fix
(fetchpatch {
url = "https://github.com/webtorrent/webtorrent-desktop/pull/2389.patch";
hash = "sha256-hBJGLNNjcGRhYOFlLm/RL0po+70tEeJtR6Y/CfacPAI=";
})
];
npmDepsHash = "sha256-tqhp3jDb1xtyV/n9kJtzkiznLQfqeYWeZiTnTVV0ibE=";
makeCacheWritable = true; makeCacheWritable = true;
npmRebuildFlags = [ "--ignore-scripts" ]; npmRebuildFlags = [ "--ignore-scripts" ];
installPhase = '' installPhase = ''
@ -31,7 +43,7 @@ buildNpmPackage {
cat > $out/bin/WebTorrent <<EOF cat > $out/bin/WebTorrent <<EOF
#! ${stdenv.shell} #! ${stdenv.shell}
set -eu set -eu
exec ${electron_22}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@" exec ${electron}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@"
EOF EOF
chmod +x $out/bin/WebTorrent chmod +x $out/bin/WebTorrent
cp -r static/linux/share/icons $out/share/ cp -r static/linux/share/icons $out/share/

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

@ -36442,7 +36442,9 @@ with pkgs;
webssh = with python3Packages; toPythonApplication webssh; webssh = with python3Packages; toPythonApplication webssh;
webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop { }; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {
electron = electron_27;
};
wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { };