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

* Updated GTK+, Glib.

Browse Source 
* Build GTK+ with CUPS support (mostly to get decent printing in
  Firefox).

svn path=/nixpkgs/trunk/; revision=17951
This commit is contained in:
Eelco Dolstra 2009-10-24 17:29:37 +00:00
parent bd7526951e
commit 2bdf38dab2
5 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,9 +8,11 @@ rec {
pango = (import ./pango) (args // { inherit glib cairo; }); pango = (import ./pango) (args // { inherit glib cairo; });
gtk = (import ./gtk+) (args // { gtk = import ./gtk+ {
inherit glib atk pango; inherit stdenv fetchurl pkgconfig x11 glib atk pango libtiff
}); libjpeg libpng cairo libXrandr libXinerama perl jasper
cups openssl;
};
glibmm = (import ./glibmm) (args // { inherit glib; }); glibmm = (import ./glibmm) (args // { inherit glib; });

4
pkgs/development/libraries/gtk-libs/2.18/glib/default.nix
View File

@ -1,11 +1,11 @@
args: with args; args: with args;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glib-2.22.0"; name = "glib-2.22.2";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2"; url = "mirror://gnome/sources/glib/2.22/${name}.tar.bz2";
sha256 = "0wd6r0bdrrd9k1ipryf5dfk8cf5vcnhiib49s5x5xskwzaaxlz7p"; sha256 = "18ycpaf69wlpp4wq385hkq7bcfhbis8ncd7wl7zmwgrdzh11v954";
}; };
buildInputs = [pkgconfig gettext perl]; buildInputs = [pkgconfig gettext perl];

20
pkgs/development/libraries/gtk-libs/2.18/gtk+/default.nix
View File

@ -1,18 +1,26 @@
args: with args; { stdenv, fetchurl, pkgconfig, x11, glib, atk, pango, libtiff, libjpeg
, libpng, cairo, libXrandr, perl, jasper
, xineramaSupport ? true, libXinerama ? null
, cupsSupport ? true, cups ? null, openssl ? null
}:
assert xineramaSupport -> libXinerama != null;
assert cupsSupport -> cups != null && openssl != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtk+-2.18.0"; name = "gtk+-2.18.3";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2"; url = "mirror://gnome/sources/gtk+/2.18/${name}.tar.bz2";
sha256 = "0hfjib98m47nrmv31h6k82fz35hzahykhifdsi5afy5yglrfkz05"; sha256 = "1gv8lx7a00yp95ss0vzvmda4nv213m8adjdkx18hhmhaavz6a1hw";
}; };
buildInputs = [ pkgconfig perl jasper ]; buildInputs = [ pkgconfig perl jasper ];
propagatedBuildInputs = [ propagatedBuildInputs =
x11 glib atk pango libtiff libjpeg libpng cairo libXrandr [ x11 glib atk pango libtiff libjpeg libpng cairo libXrandr ]
] ++ stdenv.lib.optional xineramaSupport libXinerama; ++ stdenv.lib.optional xineramaSupport libXinerama
++ stdenv.lib.optionals cupsSupport [ cups openssl ];
passthru = { inherit libtiff libjpeg libpng; }; passthru = { inherit libtiff libjpeg libpng; };

2
pkgs/development/libraries/gtk-libs/2.18/pango/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1hx6v6w3xk9wfcrb26gg7rrfl6m6ykxk2bqm67aqdzql4vysxgz1"; sha256 = "1hx6v6w3xk9wfcrb26gg7rrfl6m6ykxk2bqm67aqdzql4vysxgz1";
}; };
buildInputs = [pkgconfig] ++ (if stdenv.system == "i686-darwin" then [gettext] else []); buildInputs = [pkgconfig] ++ stdenv.lib.optional (stdenv.system == "i686-darwin") gettext;
propagatedBuildInputs = [x11 glib cairo libpng]; propagatedBuildInputs = [x11 glib cairo libpng];

5
pkgs/top-level/all-packages.nix
View File

@ -3590,7 +3590,8 @@ let
gtkLibs218 = import ../development/libraries/gtk-libs/2.18 { gtkLibs218 = import ../development/libraries/gtk-libs/2.18 {
inherit fetchurl stdenv pkgconfig gettext perl x11 jasper inherit fetchurl stdenv pkgconfig gettext perl x11 jasper
libtiff libjpeg libpng cairo libsigcxx cairomm; libtiff libjpeg libpng cairo libsigcxx cairomm cups
openssl;
inherit (xlibs) libXinerama libXrandr; inherit (xlibs) libXinerama libXrandr;
xineramaSupport = true; xineramaSupport = true;
}; };
@ -4111,7 +4112,7 @@ let
pythonSupport = true; pythonSupport = true;
}; };
libxslt = import ../development/libraries/libxslt { libxslt = makeOverridable (import ../development/libraries/libxslt) {
inherit fetchurl stdenv libxml2; inherit fetchurl stdenv libxml2;
}; };