diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2020-07-20 15:29:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-20 15:29:26 -0400 |
commit | 1dd4b324bf52bd37842f4ea9cbe41914035634a8 (patch) | |
tree | 4d05e8047e74c0e8275c04c26cea5ffba228c3de /pkgs/applications | |
parent | e3cba5aad991a0f355545fc0b069cbf987b577d0 (diff) | |
parent | 149987489c3168ec5efc7a68965cde72d365a99e (diff) |
Merge pull request #89758 from prusnak/electron-explicit
electron: mark insecure versions (3,4,5) and require explicit version of electron in packages
Diffstat (limited to 'pkgs/applications')
7 files changed, 24 insertions, 8 deletions
diff --git a/pkgs/applications/blockchains/whirlpool-gui/default.nix b/pkgs/applications/blockchains/whirlpool-gui/default.nix index 17b817bc61dc4..9a660bb8bffb8 100644 --- a/pkgs/applications/blockchains/whirlpool-gui/default.nix +++ b/pkgs/applications/blockchains/whirlpool-gui/default.nix @@ -3,6 +3,7 @@ let system = stdenv.hostPlatform.system; + electron = electron_7; in stdenv.mkDerivation rec { pname = "whirlpool-gui"; @@ -71,7 +72,7 @@ in stdenv.mkDerivation rec { ln -s "${desktopItem}/share/applications" "$out/share/applications" # wrap electron - makeWrapper '${electron_7}/bin/electron' "$out/bin/whirlpool-gui" \ + makeWrapper '${electron}/bin/electron' "$out/bin/whirlpool-gui" \ --add-flags "$out/libexec/whirlpool-gui" \ --prefix PATH : "${jre8}/bin:${tor}/bin" ''; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 1418734fba1a9..049ba45f7af37 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -12,6 +12,9 @@ , pandoc }: +let + electron = electron_8; +in stdenv.mkDerivation rec { pname = "typora"; version = "0.9.89"; @@ -52,7 +55,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_8}/bin/electron $out/bin/typora \ + makeWrapper ${electron}/bin/electron $out/bin/typora \ --add-flags $out/share/typora \ "''${gappsWrapperArgs[@]}" \ ${lib.optionalString withPandoc ''--prefix PATH : "${lib.makeBinPath [ pandoc ]}"''} \ diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index bbaa135f47e16..bb85c84f7ee25 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -16,7 +16,7 @@ let genericName = "Obinskit keyboard configurator"; categories = "Utility"; }; - + electron = electron_3; in stdenv.mkDerivation rec { pname = "obinskit"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_3}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}" ''; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 87e8316c2c4f4..85098b0b003cf 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -1,8 +1,11 @@ -{ stdenv, lib, fetchurl, makeWrapper, wrapGAppsHook, electron +{ stdenv, lib, fetchurl, makeWrapper, wrapGAppsHook, electron_7 , common-updater-scripts , writeShellScript }: +let + electron = electron_7; +in stdenv.mkDerivation rec { pname = "stretchly"; version = "0.21.1"; diff --git a/pkgs/applications/misc/teleprompter/default.nix b/pkgs/applications/misc/teleprompter/default.nix index 7cca3afa764d2..37b3f10329b9d 100644 --- a/pkgs/applications/misc/teleprompter/default.nix +++ b/pkgs/applications/misc/teleprompter/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchurl, electron, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: +{ lib, stdenv, fetchurl, electron_4, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: +let + electron = electron_4; +in stdenv.mkDerivation rec { pname = "teleprompter"; version = "2.3.4"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index f7a904f1e3612..d39091d4618eb 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -1,5 +1,8 @@ -{ autoPatchelfHook, electron, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: +{ autoPatchelfHook, electron_4, fetchurl, makeDesktopItem, makeWrapper, nodePackages, nss, stdenv, xdg_utils, xorg }: +let + electron = electron_4; +in stdenv.mkDerivation rec { pname = "rambox-pro"; version = "1.3.2"; diff --git a/pkgs/applications/networking/openbazaar/client.nix b/pkgs/applications/networking/openbazaar/client.nix index 02e05fac6502b..07f374097f245 100644 --- a/pkgs/applications/networking/openbazaar/client.nix +++ b/pkgs/applications/networking/openbazaar/client.nix @@ -8,6 +8,9 @@ , electron_6 }: +let + electron = electron_6; +in stdenv.mkDerivation rec { pname = "openbazaar-client"; version = "2.4.6"; @@ -42,7 +45,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_6}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; |