Merge pull request #84981 from prusnak/electron-wrapGAppsHook

electron: fix wrapGAppsHook usage

pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix

@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub
 , makeWrapper, makeDesktopItem, mkYarnPackage
-, electron_7, riot-web, gtk3
+, electron_7, riot-web
-, wrapGAppsHook, glib
 }:
 # Notes for maintainers:
 # * versions of `riot-web` and `riot-desktop` should be kept in sync.
@@ -27,14 +26,7 @@ in mkYarnPackage rec {
   packageJSON = ./riot-desktop-package.json;
   yarnNix = ./riot-desktop-yarndeps.nix;
 
-  nativeBuildInputs = [ wrapGAppsHook ];
+  nativeBuildInputs = [ makeWrapper ];
-
-  extraBuildInputs = [
-    glib
-    gtk3
-  ];
-
-  dontWrapGApps = true;
 
   installPhase = ''
     # resources
@@ -54,13 +46,10 @@ in mkYarnPackage rec {
     # desktop item
     mkdir -p "$out/share"
     ln -s "${desktopItem}/share/applications" "$out/share/applications"
-  '';
 
-  postFixup = ''
     # executable wrapper
     makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
-      --add-flags "$out/share/riot/electron" \
+      --add-flags "$out/share/riot/electron"
-      "''${gappsWrapperArgs[@]}"
   '';
 
   # Do not attempt generating a tarball for riot-web again.

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;

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" \