Commit 97dd4e7f authored by Herwig Hochleitner's avatar Herwig Hochleitner
Browse files

webtorrent_desktop: use electron 27

parent 3655645e

pkgs/applications/video/webtorrent_desktop/default.nix

+18 −6
Original line number Diff line number Diff line 
{ lib, stdenv, electron_22, buildNpmPackage, fetchFromGitHub }:

{ lib, stdenv, electron, buildNpmPackage, fetchFromGitHub, fetchpatch }:



buildNpmPackage {

  pname = "webtorrent-desktop";

  version = "0.25-pre";

  version = "0.25-pre-1eb612";

  src = fetchFromGitHub {

    owner = "webtorrent";

    repo = "webtorrent-desktop";

    rev = "fce078defefd575cb35a5c79d3d9f96affc8a08f";

    sha256 = "sha256-gXFiG36qqR0QHTqhaxgQKDO0UCHkJLnVwUTQB/Nct/c=";

    rev = "1eb61201d6360698a2cc4ea72bf0fa7ee78b457c";

    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;

  npmRebuildFlags = [ "--ignore-scripts" ];

  installPhase = ''
@@ -31,7 +43,7 @@ buildNpmPackage { 
    cat > $out/bin/WebTorrent <<EOF

    #! ${stdenv.shell}

    set -eu

    exec ${electron_22}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@"

    exec ${electron}/bin/electron --no-sandbox $out/lib/webtorrent-desktop "\$@"

    EOF

    chmod +x $out/bin/WebTorrent

    cp -r static/linux/share/icons $out/share/

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -36442,7 +36442,9 @@ with pkgs; 














  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 { };