JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Enable Xinerama support in GTK. This is nice for applications like GQView.

Browse Source 
svn path=/nixpkgs/trunk/; revision=4164
This commit is contained in:
Eelco Dolstra 2005-10-29 20:35:56 +00:00
parent 9b6e112573
commit 0e25817b25
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/gtk-libs-2.8/default.nix
View File

@ -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;
};
}

15
pkgs/development/libraries/gtk-libs-2.8/gtk+/default.nix
View File

@ -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;
}

2
pkgs/system/all-packages-generic.nix
View File

@ -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 {