diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-07 21:03:16 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-07 21:03:16 +0000 |
| commit | a8dba7888b8e0e956cee6accdec4cb9b803fbcc8 (patch) | |
| tree | 3338f91f943da27cef98c4c4ab0ba4eba36d3f67 /pkgs/development/libraries/gtk+/3.2.x.nix | |
| parent | acd9d6b42e81213101710c59eabe125706e6ca57 (diff) | |
| download | nixpkgs-a8dba7888b8e0e956cee6accdec4cb9b803fbcc8.tar nixpkgs-a8dba7888b8e0e956cee6accdec4cb9b803fbcc8.tar.gz nixpkgs-a8dba7888b8e0e956cee6accdec4cb9b803fbcc8.tar.bz2 nixpkgs-a8dba7888b8e0e956cee6accdec4cb9b803fbcc8.tar.lz nixpkgs-a8dba7888b8e0e956cee6accdec4cb9b803fbcc8.tar.xz nixpkgs-a8dba7888b8e0e956cee6accdec4cb9b803fbcc8.tar.zst nixpkgs-a8dba7888b8e0e956cee6accdec4cb9b803fbcc8.zip | |
Move gtkLibs3x to top-level namespace, gtk+-3.2.3
Cherry-pick /nixpkgs/branches/glib-2.30@32044 svn path=/nixpkgs/trunk/; revision=32129
Diffstat (limited to 'pkgs/development/libraries/gtk+/3.2.x.nix')
| -rw-r--r-- | pkgs/development/libraries/gtk+/3.2.x.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/libraries/gtk+/3.2.x.nix b/pkgs/development/libraries/gtk+/3.2.x.nix index a72411d1636..826fb81cf87 100644 --- a/pkgs/development/libraries/gtk+/3.2.x.nix +++ b/pkgs/development/libraries/gtk+/3.2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl_gnome, pkgconfig, glib, atk, pango, cairo, perl, xlibs +{ stdenv, fetchurl, pkgconfig, glib, atk, pango129, cairo, perl, xlibs , gdk_pixbuf, xz , xineramaSupport ? true , cupsSupport ? true, cups ? null @@ -8,12 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null; assert cupsSupport -> cups != null; stdenv.mkDerivation rec { - name = src.pkgname; + name = "gtk+-3.2.3"; - src = fetchurl_gnome { - project = "gtk+"; - major = "3"; minor = "2"; patchlevel = "0"; extension = "xz"; - sha256 = "0k6l5sw8njbnbapzm9v5jwlrrl7xv1b8c9lmqx97bzbapslw3qxw"; + src = fetchurl { + url = mirror://gnome/sources/gtk+/3.2/gtk+-3.2.3.tar.xz; + sha256 = "0g8x2kcqq17bccm4yszim837saj73zfk66ia2azcgfqfa7r21kz2"; }; enableParallelBuilding = true; @@ -21,14 +20,12 @@ stdenv.mkDerivation rec { buildNativeInputs = [ perl pkgconfig xz ]; propagatedBuildInputs = - [ xlibs.xlibs glib atk pango gdk_pixbuf cairo + [ xlibs.xlibs glib atk pango129 gdk_pixbuf cairo xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi ] ++ stdenv.lib.optional xineramaSupport xlibs.libXinerama ++ stdenv.lib.optionals cupsSupport [ cups ]; - configureFlags = "--with-xinput=yes"; - postInstall = "rm -rf $out/share/gtk-doc"; meta = { |