summary refs log tree commit diff
path: root/pkgs/applications/misc
diff options
context:
space:
mode:
authorPavol Rusnak <pavol@rusnak.io>2020-05-22 18:25:35 +0200
committerPavol Rusnak <pavol@rusnak.io>2020-07-20 17:58:55 +0200
commit4d6411288c29adc48f16851fd83524c0944073d8 (patch)
tree55bd243344f7c80a1134fefb2c3a149a487d7240 /pkgs/applications/misc
parentc050aa6a4b43a6dbe25890cd158da71edc5f980f (diff)
electron: point electron alias to the latest stable version
+ require explicit version of electron in packages
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r--pkgs/applications/misc/obinskit/default.nix4
-rw-r--r--pkgs/applications/misc/stretchly/default.nix5
-rw-r--r--pkgs/applications/misc/teleprompter/default.nix5
3 files changed, 10 insertions, 4 deletions
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";