public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65036 from svalaskevicius/fix-crash-in-electron5

Browse Source 
electron_5: fix crash when using file chooser dialog
This commit is contained in:
worldofpeace 2019-07-18 15:40:51 -04:00 committed by GitHub
commit f60744b578
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/tools/electron/5.x.nix
View File

@ -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 let
version = "5.0.0"; version = "5.0.0";
@ -35,7 +35,15 @@ let
}; };
}.${stdenv.hostPlatform.system} or throwSystem; }.${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 = '' buildCommand = ''
mkdir -p $out/lib/electron $out/bin mkdir -p $out/lib/electron $out/bin
@ -50,7 +58,8 @@ let
$out/lib/electron/electron $out/lib/electron/electron
wrapProgram $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[@]}"
''; '';
}; };