Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ryan Trinkle
8605dab964
webkitgtk: add darwin support
2016-03-30 09:40:36 +02:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Stéphane Jourdois
0a2c78fb5f
cairo: maintenance update 1.14.2 -> 1.14.4 ( close #10778 )
2015-11-04 18:39:28 +01:00
Vladimír Čunát
436bf848b9
cairo: reduce bin output, and fixup a reference
2015-10-28 19:38:17 +01:00
Vladimír Čunát
fd819711c6
cairo: get rid of xlibs-wrapper
2015-10-13 20:18:50 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
0c74f18e4c
xlibs.xlibs: remove
...
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba
Use common licence attributes from lib/licenses.nix
...
Many (less easily automatically converted) old-style strings
remain.
Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.
Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Vladimír Čunát
d3399ca45b
cairo: maintenance update
...
The removed patch was included in the release.
2015-04-18 07:08:15 +02:00
Eric Seidel
e08b9ab8d3
kill libiconvOr*
...
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Vladimír Čunát
e75fe2e528
cairo: pull an upstream patch to fix racket
...
Close #5165 , #5166 .
Also enableParallelBuilding in racket.
2014-11-28 20:28:47 +01:00
Vladimír Čunát
39b5e54bbe
cairo: major update 1.12.* -> 1.14.0
...
ABI diff only suggest that one enum value got updated,
which should be fine for us.
http://upstream-tracker.org/compat_reports/cairo/1.12.16_to_1.14.0/abi_compat_report.html#Low_Risk_Problems
2014-10-19 19:31:58 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
e07ce3314d
Fix some "meta.licenses" attributes
2014-01-25 03:04:46 +01:00
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
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 1278859d310c020c98f9
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
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
0003f76f9b
* Cairo 1.10.2.
...
svn path=/nixpkgs/branches/x-updates/; revision=25819
2011-02-08 17:57:00 +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
