about summary refs log tree commit diff
path: root/pkgs/applications/networking/instant-messengers/riot
diff options
context:
space:
mode:
authorPavol Rusnak <pavol@rusnak.io>2020-04-11 12:05:57 +0200
committerPavol Rusnak <pavol@rusnak.io>2020-04-11 21:54:34 +0200
commit3abd151f8ebcf84576687a68e4e8dc47950000a1 (patch)
tree8999c5f2ff00bff74553ed1431a41d413617a2b5 /pkgs/applications/networking/instant-messengers/riot
parent7cbffa0530334170f4375f409a13a06fde1bb217 (diff)
downloadnixlib-3abd151f8ebcf84576687a68e4e8dc47950000a1.tar
nixlib-3abd151f8ebcf84576687a68e4e8dc47950000a1.tar.gz
nixlib-3abd151f8ebcf84576687a68e4e8dc47950000a1.tar.bz2
nixlib-3abd151f8ebcf84576687a68e4e8dc47950000a1.tar.lz
nixlib-3abd151f8ebcf84576687a68e4e8dc47950000a1.tar.xz
nixlib-3abd151f8ebcf84576687a68e4e8dc47950000a1.tar.zst
nixlib-3abd151f8ebcf84576687a68e4e8dc47950000a1.zip
Revert "riot-desktop: wrap with wrapGAppsHook"
This reverts commit fe6addbbf717d4977434e81acd7535c3b074e3a3.
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/riot')
-rw-r--r--pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix17
1 files 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 70be3698a789..a30df623050d 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.