diff --git a/pkgs/development/libraries/gtk-libs-2.8/default.nix b/pkgs/development/libraries/gtk-libs-2.8/default.nix index d7e0b2673dd..ee5abd562b1 100644 --- a/pkgs/development/libraries/gtk-libs-2.8/default.nix +++ b/pkgs/development/libraries/gtk-libs-2.8/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, gettext, perl, x11 -, libtiff, libjpeg, libpng, cairo +{ xineramaSupport ? false +, stdenv, fetchurl, pkgconfig, gettext, perl, x11 +, libtiff, libjpeg, libpng, cairo, libXinerama ? null }: rec { @@ -18,7 +19,8 @@ rec { gtk = (import ./gtk+) { inherit fetchurl stdenv pkgconfig glib atk pango perl - libtiff libjpeg libpng x11 cairo; + libtiff libjpeg libpng x11 cairo libXinerama + xineramaSupport; }; } diff --git a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix index 6b066f3437e..2e879ab50ba 100644 --- a/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix +++ b/pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, x11, glib, atk -, pango, perl, libtiff, libjpeg, libpng, cairo +{ xineramaSupport ? false +, stdenv, fetchurl, pkgconfig, x11, glib, atk +, pango, perl, libtiff, libjpeg, libpng, cairo, libXinerama ? null }: -assert pkgconfig != null && x11 != null && glib != null && atk != null - && pango != null && perl != null && perl != null && libtiff != null - && libjpeg != null && libpng != null; assert x11.buildClientLibs; +assert xineramaSupport -> libXinerama != null; + stdenv.mkDerivation { name = "gtk+-2.8.6"; @@ -13,7 +13,10 @@ stdenv.mkDerivation { url = ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-2.8.6.tar.bz2; md5 = "2bcb9e3feb62ac895101cb8ee87ca49a"; }; - buildInputs = [pkgconfig perl libtiff libjpeg libpng cairo]; + buildInputs = [ + pkgconfig perl libtiff libjpeg libpng cairo + (if xineramaSupport then libXinerama else null) + ]; propagatedBuildInputs = [x11 glib atk pango]; inherit libtiff libjpeg libpng; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 8f7aee777fe..861764f8d7b 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -829,6 +829,8 @@ rec { gtkLibs28 = import ../development/libraries/gtk-libs-2.8 { inherit fetchurl stdenv pkgconfig gettext perl x11 libtiff libjpeg libpng cairo; + inherit (xlibs) libXinerama; + xineramaSupport = true; }; gtkLibs26 = import ../development/libraries/gtk-libs-2.6 {