public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sway: Fix the GTK wrapper (#86960)

Browse Source 
Fixes #67704.
This commit is contained in:
Ely 2020-05-08 11:45:27 +02:00 committed by GitHub
parent 18aad27407
commit cdfad5ad84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/window-managers/sway/default.nix
View File

@ -2,7 +2,7 @@
, meson, ninja , meson, ninja
, pkgconfig, scdoc , pkgconfig, scdoc
, wayland, libxkbcommon, pcre, json_c, dbus, libevdev , 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 , wlroots, wayland-protocols
}: }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
wayland libxkbcommon pcre json_c dbus libevdev 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 wlroots wayland-protocols
]; ];

12
pkgs/applications/window-managers/sway/wrapper.nix
View File

@ -2,7 +2,7 @@
, sway-unwrapped, swaybg , sway-unwrapped, swaybg
, makeWrapper, symlinkJoin, writeShellScriptBin , makeWrapper, symlinkJoin, writeShellScriptBin
, withBaseWrapper ? true, extraSessionCommands ? "", dbus , withBaseWrapper ? true, extraSessionCommands ? "", dbus
, withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3
, extraOptions ? [] # E.g.: [ "--verbose" ] , extraOptions ? [] # E.g.: [ "--verbose" ]
}: }:
@ -33,12 +33,14 @@ in symlinkJoin {
nativeBuildInputs = [ makeWrapper ] nativeBuildInputs = [ makeWrapper ]
++ (optional withGtkWrapper wrapGAppsHook); ++ (optional withGtkWrapper wrapGAppsHook);
buildInputs = optional withGtkWrapper gdk-pixbuf; buildInputs = optionals withGtkWrapper [ gdk-pixbuf glib gtk3 ];
# We want to run wrapProgram manually
dontWrapGApps = true;
postBuild = '' postBuild = ''
# We want to run wrapProgram manually to only wrap sway and add swaybg: ${optionalString withGtkWrapper "gappsWrapperArgsHook"}
export dontWrapGApps=true
${optionalString withGtkWrapper "wrapGAppsHook"}
wrapProgram $out/bin/sway \ wrapProgram $out/bin/sway \
--prefix PATH : "${swaybg}/bin" \ --prefix PATH : "${swaybg}/bin" \
${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \ ${optionalString withGtkWrapper ''"''${gappsWrapperArgs[@]}"''} \