diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2020-04-13 17:43:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 17:43:17 -0400 |
| commit | d49d8401ffefd723df62531764136aa3cb5e6392 (patch) | |
| tree | af0425e16e3c6014fff9efbe4d16b96fdb1b53be /pkgs/development/tools | |
| parent | 84b91899c371fe9336642cb2d7d4990f528ee656 (diff) | |
| parent | 96f52cb22b20d040c3498008b1bcbe75f89a11e9 (diff) | |
| download | nixlib-d49d8401ffefd723df62531764136aa3cb5e6392.tar nixlib-d49d8401ffefd723df62531764136aa3cb5e6392.tar.gz nixlib-d49d8401ffefd723df62531764136aa3cb5e6392.tar.bz2 nixlib-d49d8401ffefd723df62531764136aa3cb5e6392.tar.lz nixlib-d49d8401ffefd723df62531764136aa3cb5e6392.tar.xz nixlib-d49d8401ffefd723df62531764136aa3cb5e6392.tar.zst nixlib-d49d8401ffefd723df62531764136aa3cb5e6392.zip | |
Merge pull request #84981 from prusnak/electron-wrapGAppsHook
electron: fix wrapGAppsHook usage
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/electron/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/electron/generic.nix | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d23c5a663e62..9897405d06f9 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }@args: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core }@args: let mkElectron = import ./generic.nix args; diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index 9bcc4dd6ff31..018625da456a 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: +{ stdenv, libXScrnSaver, makeWrapper, fetchurl, wrapGAppsHook, glib, gtk3, unzip, atomEnv, libuuid, at-spi2-atk, at-spi2-core}: version: hashes: let @@ -34,7 +34,7 @@ let }; linux = { - buildInputs = [ gtk3 ]; + buildInputs = [ glib gtk3 ]; nativeBuildInputs = [ unzip @@ -44,13 +44,16 @@ let dontWrapGApps = true; # electron is in lib, we need to wrap it manually - buildCommand = '' + dontUnpack = true; + dontBuild = true; + + installPhase = '' mkdir -p $out/lib/electron $out/bin unzip -d $out/lib/electron $src ln -s $out/lib/electron/electron $out/bin + ''; - fixupPhase - + postFixup = '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk at-spi2-core ]}:$out/lib/electron" \ |