Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Sander van der Burg
ccb2c7ebb7
Removed Xrender from cairo and add fontconfig to pango on Darwin: this fixes the compilation of graphviz and imagemagick on these platforms
2013-03-14 15:18:55 +01:00
Vladimír Čunát
0d72174dbd
Merge branch stdenv-updates into x-updates
...
x-updates is supposed to merge after stdenv-updates, so let's test it
Conflicts:
pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát
6331d32267
rename the expressions of some gtk-related libraries
...
now the default (and usually only) version is called default
2013-01-29 16:48:23 +01:00
Eelco Dolstra
ab3eeabfed
Rename buildNativeInputs -> nativeBuildInputs
...
Likewise for propagatedBuildNativeInputs, etc. "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
62cd9ea869
pango: Update to 1.30.1
2012-09-26 15:17:31 -04:00
Eelco Dolstra
277bd69fa9
* Glib/ATK/Pango/GTK+ updates.
...
svn path=/nixpkgs/branches/x-updates/; revision=34145
2012-05-16 21:58:57 +00:00
Eelco Dolstra
bf2d945a02
* Disable some failing builds on specific platforms.
...
svn path=/nixpkgs/trunk/; revision=34033
2012-05-09 21:10:12 +00:00
Yury G. Kudryashov
b0aa85371b
Use pango-1.29
...
svn path=/nixpkgs/trunk/; revision=32935
2012-03-08 23:25:52 +00:00
Yury G. Kudryashov
5144a19987
svn merge ^/nixpkgs/trunk
...
There were a few merge conflicts due to ensureDir->mkdir -p migration
svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Yury G. Kudryashov
acd9d6b42e
pango-1.29: use fetchurl
...
cherry-pick /nixpkgs/branches/glib-2.30@32043
svn path=/nixpkgs/trunk/; revision=32128
2012-02-07 21:03:12 +00:00
Eelco Dolstra
d4d7931a62
* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
...
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Yury G. Kudryashov
cee470de5a
Remove gtk+-2.16
...
svn path=/nixpkgs/trunk/; revision=31370
2012-01-06 19:02:07 +00:00
Yury G. Kudryashov
32dd8c0854
gtkLibx3x update
...
svn path=/nixpkgs/trunk/; revision=29726
2011-10-09 08:38:34 +00:00
Yury G. Kudryashov
de89582238
Add gtk-3.x libraries
...
Let hydra build it but do not show in nix-env -qa
svn path=/nixpkgs/trunk/; revision=29398
2011-09-20 16:18:12 +00:00
Yury G. Kudryashov
e803d715c2
pango: pkg-config is a native buildInput
...
switch to fetchurl_gnome
svn path=/nixpkgs/trunk/; revision=29382
2011-09-20 06:22:30 +00:00
Eelco Dolstra
36c7d88de8
* Pango updated to 1.28.4.
...
svn path=/nixpkgs/branches/kde-4.7/; revision=27624
2011-07-07 15:43:26 +00:00
Eelco Dolstra
6a59d1a98f
* Latest Glib, ATK, Pango and GTK+.
...
* Added gdk-pixbuf, which has been revived and is required by GTK+.
* Don't install the documentation of aforementioned packages. This
cuts 56 MiB off the closure of GTK+-based packages. It wasn't
really useful anyway because it's not installed in a way that allows
users to find it easily on NixOS. And if you want it, it's faster
to Google it.
svn path=/nixpkgs/branches/x-updates/; revision=25853
2011-02-09 15:09:29 +00:00
Eelco Dolstra
b705289759
* Remove gtkLibs218 and an old Cairo.
...
svn path=/nixpkgs/branches/x-updates/; revision=25824
2011-02-09 10:49:20 +00:00
Peter Simons
8a3066dca8
pkgs/development/libraries/pango: support 64-bit Darwin
...
svn path=/nixpkgs/trunk/; revision=24114
2010-10-06 11:52:00 +00:00
Peter Simons
69aa532b32
pkgs/development/libraries/pango: updated to version 1.28.3
...
svn path=/nixpkgs/trunk/; revision=24113
2010-10-06 11:51:53 +00:00
Eelco Dolstra
0695a9707c
* GTK+ 2.20, Glib 2.24 etc.
...
svn path=/nixpkgs/branches/x-updates/; revision=22652
2010-07-18 23:22:59 +00:00
Peter Simons
0563e08996
pkgs/development/libraries/pango/1.26.x.nix: enable hydra builds on all platforms, not just Linux
...
svn path=/nixpkgs/trunk/; revision=21835
2010-05-18 12:07:48 +00:00
Eelco Dolstra
35257ada4e
* Updated gtk+, glib, pango.
...
svn path=/nixpkgs/trunk/; revision=19388
2010-01-13 12:11:06 +00:00
Eelco Dolstra
5682b2e9ea
* Finished getting rid of gtk-libs.
...
svn path=/nixpkgs/trunk/; revision=18010
2009-10-29 10:53:54 +00:00
Eelco Dolstra
82baac23a7
* Idem for gtk-libs/2.16.
...
svn path=/nixpkgs/trunk/; revision=17993
2009-10-28 15:31:52 +00:00