diff options
| author | Sarunas Valaskevicius <rakatan@gmail.com> | 2019-07-18 19:40:19 +0100 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-07-18 15:07:28 -0400 |
| commit | 683a10fe08ccfa8c47f01d39219b8b3bf90d028b (patch) | |
| tree | 49835210bf664d2ad815845e10b4bd44453f95f2 /pkgs/development/tools/electron | |
| parent | 7f249190c99c6db29b621b12f13273d7e8316523 (diff) | |
electron_5: fix crash when using file chooser dialog
Diffstat (limited to 'pkgs/development/tools/electron')
| -rw-r--r-- | pkgs/development/tools/electron/5.x.nix | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/pkgs/development/tools/electron/5.x.nix b/pkgs/development/tools/electron/5.x.nix index ba97587c5af7..9da68f4dc46e 100644 --- a/pkgs/development/tools/electron/5.x.nix +++ b/pkgs/development/tools/electron/5.x.nix @@ -1,4 +1,4 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }: let version = "5.0.0"; @@ -35,7 +35,15 @@ let }; }.${stdenv.hostPlatform.system} or throwSystem; - buildInputs = [ unzip makeWrapper ]; + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ + unzip + makeWrapper + wrapGAppsHook + ]; + + dontWrapGApps = true; # electron is in lib, we need to wrap it manually buildCommand = '' mkdir -p $out/lib/electron $out/bin @@ -50,7 +58,8 @@ let $out/lib/electron/electron wrapProgram $out/lib/electron/electron \ - --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 + --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \ + "''${gappsWrapperArgs[@]}" ''; }; |