mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
parent
18aad27407
commit
cdfad5ad84
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
@ -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[@]}"''} \
|
||||
|
|
Loading…
Reference in a new issue