From 3abd151f8ebcf84576687a68e4e8dc47950000a1 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sat, 11 Apr 2020 12:05:57 +0200
Subject: [PATCH] Revert "riot-desktop: wrap with wrapGAppsHook"

This reverts commit fe6addbbf717d4977434e81acd7535c3b074e3a3.
---
 .../instant-messengers/riot/riot-desktop.nix    | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
index 70be3698a78..a30df623050 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub
 , makeWrapper, makeDesktopItem, mkYarnPackage
-, electron_7, riot-web, gtk3
-, wrapGAppsHook, glib
+, electron_7, riot-web
 }:
 # 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 ];
-
-  extraBuildInputs = [
-    glib
-    gtk3
-  ];
-
-  dontWrapGApps = true;
+  nativeBuildInputs = [ makeWrapper ];
 
   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" \
-      "''${gappsWrapperArgs[@]}"
+      --add-flags "$out/share/riot/electron"
   '';
 
   # Do not attempt generating a tarball for riot-web again.