diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-04-21 01:22:43 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-04-23 10:11:22 +0000 |
| commit | 6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c (patch) | |
| tree | 4c74c507aba7f6c8ef892c729da452cdc3687435 /nixpkgs/pkgs/applications | |
| parent | 3098041824a5545dfa8fd68ce4b2842d9480cece (diff) | |
| download | nixlib-6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c.tar nixlib-6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c.tar.gz nixlib-6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c.tar.bz2 nixlib-6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c.tar.lz nixlib-6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c.tar.xz nixlib-6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c.tar.zst nixlib-6d8e80e90dc9d8fbb2436fc053ac3e9f6402db3c.zip | |
sway: make gdk_pixbuf support optional
Diffstat (limited to 'nixpkgs/pkgs/applications')
| -rw-r--r-- | nixpkgs/pkgs/applications/window-managers/sway/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/window-managers/sway/default.nix b/nixpkgs/pkgs/applications/window-managers/sway/default.nix index e01112bc9010..08eb16999991 100644 --- a/nixpkgs/pkgs/applications/window-managers/sway/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/sway/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, fetchpatch +{ stdenv, lib, fetchFromGitHub, fetchpatch , meson, ninja , pkgconfig, scdoc , wayland, libxkbcommon, pcre, json_c, libevdev, pango, cairo, libinput -, gdk_pixbuf , wlroots, wayland-protocols + +, gdkPixbufSupport ? true, gdk_pixbuf }: stdenv.mkDerivation rec { @@ -31,18 +32,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja scdoc ]; buildInputs = [ - wayland libxkbcommon pcre json_c libevdev pango cairo libinput gdk_pixbuf + wayland libxkbcommon pcre json_c libevdev pango cairo libinput wlroots wayland-protocols - ]; + ] ++ lib.optional gdkPixbufSupport gdk_pixbuf; enableParallelBuilding = true; mesonFlags = [ - "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dgdk-pixbuf=enabled" + "-Ddefault-wallpaper=false" "-Dxwayland=enabled" "-Dtray=enabled" "-Dman-pages=enabled" - ]; + ] ++ lib.optional gdkPixbufSupport "-Dgdk-pixbuf=enabled"; - meta = with stdenv.lib; { + meta = with lib; { description = "i3-compatible tiling Wayland compositor"; homepage = https://swaywm.org; license = licenses.mit; |