JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,133 Commits 2 Branches 0 Tags 12 GiB
1a55c4b89f
Commit Graph

63 Commits

Author SHA1 Message Date
Mathijs Kwik
1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
 2013-09-11 10:53:31 +02:00
Vladimír Čunát
f082abfd55 cairo: bugfix update 
Released less than a day ago :-)
 2013-08-27 17:44:21 +02:00
Vladimír Čunát
207ca1f05a darwin: attempt to fix pango via flattening cairo includes 
Changes hash only on darwin.
 2013-08-07 18:28:04 +02:00
Vladimír Čunát
98f3716650 clean some include flags that weren't really needed 
Tested the builds still work (x86_64-linux).
 2013-08-03 10:45:13 +02:00
Eelco Dolstra
552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-25 18:42:56 +02:00
Jason \"Don\" O'Conal
8ce7550a9f cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
Michael Raskin
1a41887398 Fix a missing option declaration after merge 2013-06-14 00:11:34 +04:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal
930b88c2a9 cairo: add correct include path for pixman.h 2013-06-13 16:47:29 +10:00
Eelco Dolstra
99b88cfb53 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/acl/default.nix
	pkgs/development/libraries/atk/2.6.x.nix
	pkgs/development/libraries/attr/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/2.34.x.nix
	pkgs/development/libraries/gtk+/2.24.x.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/openssl/default.nix
	pkgs/development/libraries/pango/1.30.x.nix
	pkgs/misc/cups/default.nix
	pkgs/os-specific/linux/util-linux/default.nix
	pkgs/servers/x11/xorg/builder.sh
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
 2013-06-09 00:41:27 +02:00
Vladimír Čunát
2e36aee508 cairo: expression refactoring, build OpenGL support by default 
Mesa is now only a small dependency.
 2013-06-01 23:38:29 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat 
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
 2013-05-09 14:03:35 +02:00
Vladimír Čunát
ec736312d4 Merge branch 'master' into x-updates 
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
 2013-04-17 18:26:28 +02:00
Vladimír Čunát
d8a2ae8d01 some libintl and libiconv cleanups + non-linux fixes 2013-04-14 13:43:09 +02:00
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
Shea Levy
897840f76f Add cairo-1.12.2 
Needed for an upcoming fix to eclipse.

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-03-11 19:19:48 -04:00
Carles Pagès
d32a973fc9 Merge remote-tracking branch 'upstream/x-updates' into wayland 
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/wayland/default.nix
 2013-02-18 20:15:59 +01:00
Vladimír Čunát
ab963aa789 cairo: bugfix update 2013-02-10 16:33:15 +01:00
Vladimír Čunát
c53724f317 fontconfig: propagation no longer needed 2013-02-10 14:19:34 +01:00
Vladimír Čunát
d85a587fdd cairo: minor bugfix update, depend on new pixman now 2013-01-31 21:50:30 +01:00
Vladimír Čunát
ec77a95778 cairo: update, use xcb by default (no longer experimental) 2013-01-29 14:55:14 +01:00
Carles Pagès
660c96b6df Add support for gl backend to cairo. 
This is also needed for the Weston compositor.
 2012-12-02 12:25:29 +01:00
Eelco Dolstra
d11ca5166c cairo: Update to 1.12.6 2012-11-23 18:18:18 +01:00
Ludovic Courtès
c8d9220257 cairo: pass `libiconvOrEmpty'; fixes builds on non-GNU system 2012-10-19 14:10:24 +02:00
Ludovic Courtès
223b285776 cairo: clear all occurrences of `-ldl' on FreeBSD 2012-10-18 12:13:07 +02:00
Ludovic Courtès
b9982a7d11 cairo: fix FreeBSD builds 2012-10-18 10:53:05 +02:00
Eelco Dolstra
dbfcc9336c cairo: Update to 1.12.4 2012-10-16 12:00:41 -04:00
Eelco Dolstra
61129e1ee9 Split some GTK/X11-related packages 
The closure of the Pan newsreader is now down from 344 MiB to 195 MiB.
 2012-08-26 22:53:19 -04:00
Eelco Dolstra
21bf5ef509 * Cairo updated to 1.12.2. 
svn path=/nixpkgs/branches/x-updates/; revision=34142
 2012-05-16 20:49:31 +00:00
Yury G. Kudryashov
6232b9129d cairo: propagate more dependencies 
svn path=/nixpkgs/trunk/; revision=31565
 2012-01-14 18:04:28 +00:00
Ludovic Courtès
e8a30536b6 Cairo: Add dependency on Gettext on non-GNU systems; build it. 
svn path=/nixpkgs/trunk/; revision=29495
 2011-09-26 12:07:24 +00:00
Yury G. Kudryashov
4e9fbf18ed Build cairo-gobject library 
Move cairo to gtkLibs.cairo

svn path=/nixpkgs/trunk/; revision=29380
 2011-09-20 06:22:14 +00:00
Eelco Dolstra
0648ceff32 * Enable the "tee" backend in Cairo. Apparently Firefox 4.0 needs 
this.

svn path=/nixpkgs/branches/x-updates/; revision=26312
 2011-03-15 09:25:08 +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
Eelco Dolstra
0003f76f9b * Cairo 1.10.2. 
svn path=/nixpkgs/branches/x-updates/; revision=25819
 2011-02-08 17:57:00 +00:00
Michael Raskin
e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet 
svn path=/nixpkgs/trunk/; revision=24714
 2010-11-16 21:05:54 +00:00
Eelco Dolstra
70ab33568d * Cairo updated to 1.8.10. 
svn path=/nixpkgs/branches/x-updates/; revision=22643
 2010-07-18 21:55:12 +00:00
Michael Raskin
7c5e566c5c Cleaned up the unspecified-extra-argument calls where there is no way to access extra arguments. Tarball and full instantiation checks passed. 
svn path=/nixpkgs/trunk/; revision=22539
 2010-07-08 19:22:50 +00:00
Michael Raskin
ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense. 
svn path=/nixpkgs/trunk/; revision=22529
 2010-07-08 13:25:52 +00:00
Eelco Dolstra
64cdcd8812 * Disable XCB support in Cairo, since it's not really supported 
currently
  (http://lists.freedesktop.org/archives/xcb/2008-December/004140.html).

svn path=/nixpkgs/branches/xorg-7.5/; revision=18030
 2009-10-29 15:26:39 +00:00
Eelco Dolstra
da182ce1d4 * Cairo 1.8.8. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18022
 2009-10-29 13:32:48 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now. 
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
 2009-04-21 23:18:09 +00:00
Eelco Dolstra
c584bb878a * Sync with trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13903
 2009-01-29 16:33:02 +00:00
Ludovic Courtès
e8847fd2e7 Cairo: Arrange so that Freetype `-I' flags are propagated. 
svn path=/nixpkgs/trunk/; revision=13843
 2009-01-25 11:50:29 +00:00
Ludovic Courtès
db7f0d3ef5 Cairo: Propagate Freetype, since public headers include it. 
svn path=/nixpkgs/trunk/; revision=13837
 2009-01-24 22:09:14 +00:00
Ludovic Courtès
0b6168c587 Cairo 1.8.6. 
svn path=/nixpkgs/trunk/; revision=13835
 2009-01-24 21:32:25 +00:00
Eelco Dolstra
c9c2045610 * Cairo: build with XCB support. 
* Fixed libXp.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13069
 2008-10-14 14:46:56 +00:00
Eelco Dolstra
5b45cce6c1 * Don't need to set CAIRO_CFLAGS anymore. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13061
 2008-10-14 12:08:07 +00:00
Eelco Dolstra
0f0a43adf5 * Cairo 1.8.0. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13005
 2008-10-08 16:57:06 +00:00