From d756aee6f6f38fac8980627f670b8ffadb20fe53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?= Date: Thu, 30 Jun 2016 10:06:20 +0200 Subject: [PATCH] Gtk : Enable wayland support on Linux --- pkgs/development/libraries/gtk+/3.x.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index e6c959638651..0662ed860135 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, gettext, perl , expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection -, xorg, wayland, epoxy, json_glib, libxkbcommon, gmp +, xorg, epoxy, json_glib, libxkbcommon, gmp +, waylandSupport ? stdenv.isLinux, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux , cupsSupport ? stdenv.isLinux, cups ? null , darwin @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xorg; with stdenv.lib; [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] - ++ optionals stdenv.isLinux [ wayland ] + ++ optionals waylandSupport [ wayland wayland-protocols ] ++ optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; @@ -53,6 +54,10 @@ stdenv.mkDerivation rec { "--disable-glibtest" "--with-gdktarget=quartz" "--enable-quartz-backend" + ] ++ optional stdenv.isLinux [ + "--enable-x11-backend" + ] ++ optional waylandSupport [ + "--enable-wayland-backend" ]; postInstall = ''