diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-30 11:13:17 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-30 11:13:53 +0200 |
| commit | dcb950718abad3c3765712570fde3889d48ded35 (patch) | |
| tree | 731aee515eab4cefc122fd61427093af0d353243 /pkgs/development/libraries/gtk+ | |
| parent | 547092d82796c5ca4f3941c30d0d035a1f2554f8 (diff) | |
| parent | d756aee6f6f38fac8980627f670b8ffadb20fe53 (diff) | |
| download | nixlib-dcb950718abad3c3765712570fde3889d48ded35.tar nixlib-dcb950718abad3c3765712570fde3889d48ded35.tar.gz nixlib-dcb950718abad3c3765712570fde3889d48ded35.tar.bz2 nixlib-dcb950718abad3c3765712570fde3889d48ded35.tar.lz nixlib-dcb950718abad3c3765712570fde3889d48ded35.tar.xz nixlib-dcb950718abad3c3765712570fde3889d48ded35.tar.zst nixlib-dcb950718abad3c3765712570fde3889d48ded35.zip | |
Merge #16617: gtk3: re-enable wayland support on Linux
Diffstat (limited to 'pkgs/development/libraries/gtk+')
| -rw-r--r-- | pkgs/development/libraries/gtk+/3.x.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 4d6c22b418b5..0f33f2a5f7fe 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 = '' |