From cdfad5ad841472941ee4a8f25fe05ad312b3f929 Mon Sep 17 00:00:00 2001
From: Ely <57923898+Elyhaka@users.noreply.github.com>
Date: Fri, 8 May 2020 11:45:27 +0200
Subject: [PATCH] sway: Fix the GTK wrapper (#86960)

Fixes #67704.
---
 pkgs/applications/window-managers/sway/default.nix |  4 ++--
 pkgs/applications/window-managers/sway/wrapper.nix | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 66596d9de04..66681ef0850 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -2,7 +2,7 @@
 , meson, ninja
 , pkgconfig, scdoc
 , wayland, libxkbcommon, pcre, json_c, dbus, libevdev
-, pango, cairo, libinput, libcap, pam, gdk-pixbuf
+, pango, cairo, libinput, libcap, pam, gdk-pixbuf, librsvg
 , wlroots, wayland-protocols
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     wayland libxkbcommon pcre json_c dbus libevdev
-    pango cairo libinput libcap pam gdk-pixbuf
+    pango cairo libinput libcap pam gdk-pixbuf librsvg
     wlroots wayland-protocols
   ];
 
diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix
index 3e12e3fcc55..fe78e1a9ff9 100644
--- a/pkgs/applications/window-managers/sway/wrapper.nix
+++ b/pkgs/applications/window-managers/sway/wrapper.nix
@@ -2,7 +2,7 @@
 , sway-unwrapped, swaybg
 , makeWrapper, symlinkJoin, writeShellScriptBin
 , withBaseWrapper ? true, extraSessionCommands ? "", dbus
-, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf
+, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3
 , extraOptions ? [] # E.g.: [ "--verbose" ]
 }:
 
@@ -33,12 +33,14 @@ in symlinkJoin {
   nativeBuildInputs = [ makeWrapper ]
     ++ (optional withGtkWrapper wrapGAppsHook);
 
-  buildInputs = optional withGtkWrapper gdk-pixbuf;
+  buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ];
+
+  # We want to run wrapProgram manually
+  dontWrapGApps = true;
 
   postBuild = ''
-    # We want to run wrapProgram manually to only wrap sway and add swaybg:
-    export dontWrapGApps=true
-    ${optionalString withGtkWrapper "wrapGAppsHook"}
+    ${optionalString withGtkWrapper "gappsWrapperArgsHook"}
+
     wrapProgram $out/bin/sway \
       --prefix PATH : "${swaybg}/bin" \
       ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \