Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 18aad27407bc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cdfad5ad8414
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 8, 2020

  1. sway: Fix the GTK wrapper (#86960)

    Fixes #67704.
    Ely authored May 8, 2020
    Copy the full SHA
    cdfad5a View commit details
Showing with 9 additions and 7 deletions.
  1. +2 −2 pkgs/applications/window-managers/sway/default.nix
  2. +7 −5 pkgs/applications/window-managers/sway/wrapper.nix
4 changes: 2 additions & 2 deletions pkgs/applications/window-managers/sway/default.nix
Original file line number Diff line number Diff line change
@@ -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
];

12 changes: 7 additions & 5 deletions pkgs/applications/window-managers/sway/wrapper.nix
Original file line number Diff line number Diff line change
@@ -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[@]}"''} \