JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
120,321 Commits 2 Branches 0 Tags 13 GiB
b3bacc34b0
Commit Graph

57 Commits

Author SHA1 Message Date
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs 
Only acts on one-line dependency lists.
 2017-09-21 15:49:53 -04:00
hsloan
9b2d1cbc70 fontconfig default: Don't use stdenv.cross 2017-06-28 19:31:16 -04:00
Vladimír Čunát
09d02f72f6
Re-revert "Merge: glibc: 2.24 -> 2.25" 
This reverts commit 55cc7700e9.
I hope most problems have been solved.  /cc #22874.
 2017-02-20 21:16:41 +01:00
Vladimír Čunát
55cc7700e9
Revert "Merge: glibc: 2.24 -> 2.25" 
This reverts commit 1daf2e26d2, reversing
changes made to c0c50dfcb7.

It seems this is what has been causing all the reliability problems
on Hydra.  I'm currently unable to find why it happens, so I'm forced
to revert the update for now.  Discussion: #22874.
 2017-02-16 18:16:06 +01:00
Vladimír Čunát
7832806e20
fontconfig: fixup fragile build after ab5fe171a 
Sometimes it might fail due to timestamps suggesting some files needed
regenerating and failing to find gperf.  Now it should be OK, I hope.
 2017-02-15 21:06:27 +01:00
Vladimír Čunát
ab5fe171af
fontconfig: patch to build with glibc-2.25 2017-02-12 11:14:45 +01:00
Alexander Ried
8417c3aae1
fontconfig: 2.11.1 -> 2.12.1 
Fixes #19302.
 2016-10-11 18:34:36 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging 
https://github.com/NixOS/nixpkgs/pull/14766
 2016-08-30 12:43:37 +03:00
Vladimír Čunát
4f73633f26 treewide: stop using fontbhttf 2016-08-29 22:28:50 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Eric Sagnes
e80e8b9dc9 fontconfig module: respect upstream definitions 2016-08-20 03:21:05 +03:00
Eric Sagnes
cd2948a72e fontconfig: fix etc priority 2016-08-20 03:21:05 +03:00
obadz
cfc0a5415b Revert "fontconfig: fix etc priority" 
This reverts commit 1e53d4a777.

Closes #16983

cc @vcunat @ericsagnes @dezgeg
 2016-07-15 20:44:21 +02:00
Eric Sagnes
1e53d4a777 fontconfig: fix etc priority 2016-07-09 16:50:13 +02:00
Vladimír Čunát
38313d5d87 libxml2,libxslt: split into multiple outputs 
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
 2015-10-05 13:44:16 +02:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs 
Fixed all 'fontconfig}' references as well, hopefully, ugh!
 2015-10-05 12:23:56 +02:00
Vladimír Čunát
3938dc3c21 freetype: fix pcf fonts by upstream patches 
The problem was uncovered by the last security patches.
Firefox seems to build and work fine.

Includes reverting 374a9cc162, as this is a proper fix.
 2014-12-17 22:12:41 +01:00
Michael Raskin
374a9cc162 Disable fontconfig tests: they break after Freetype security update, and apparently we get something working regardless of the test problems 2014-12-17 16:39:55 +03:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Domen Kožar
a390a9cbc9 fontconfig: current behavior makes substitutes fail 2014-12-01 22:01:29 +01:00
Vladimír Čunát
3ef186bdb4 fontconfig: drop infinality (for now), close #5140 
Also the simplify the expression when we rebuild anyway.
 2014-11-26 22:04:57 +01:00
Shaun Sharples
61d7fb934b fontconfig: avoid questionmark in patch name on darwin 
Close #5135.
@vcunat made this conditional to avoid rebuild for now.
 2014-11-26 17:11:44 +01:00
Vladimír Čunát
c0e2aceef4 fontconfig: patch and document 2014-11-05 12:12:30 +01:00
Vladimír Čunát
27968ece0f fontconfig: add an upstream bugfix, remove other config inclusion 2014-10-23 10:49:45 +02:00
Luca Bruno
0927405a37 fontconfig: update 2.10.2 -> 2.11.1. Close #4410, #2050 2014-10-23 10:40:26 +02:00
Luca Bruno
d4c946829f fontconfig: revert to sysconfdir=/etc. Closes #3453 2014-08-04 20:21:40 +02:00
Vladimír Čunát
dac60392fc fontconfig: attempt to fix installation on darwin 2014-06-22 11:37:43 +02:00
Vladimír Čunát
c50f0e47e1 freetype: major update, including some CVE security 
- There's no fontconfig update yet, as I failed to debug it yet.
- Infinality patches are now taken from a different (maintained) source.
 2014-06-17 09:00:29 +02:00
Vladimír Čunát
e40a059714 Revert "fontconfig: update 2.10.2 -> 2.11.0" 
This reverts commit 32a4081a7f.

After ec985c8ff the apps linked to 2.11 fontconfig run fine on nixos
with older /etc/fonts/, but the other way won't work.

Unfortunately, I see no easy work-around ATM.
 2014-02-20 20:52:27 +01:00
Vladimír Čunát
ab7b06d8c9 fontconfig: propagate freetype as *.pc requires; maintain 2014-02-05 08:16:33 +01:00
Vladimír Čunát
32a4081a7f fontconfig: update 2.10.2 -> 2.11.0 
Finally. This was blocking pango update for many months.
Hopefully the infinality patches still work with this release.
 2014-02-02 10:46:08 +01:00
Eelco Dolstra
143473406f freetype: Update to 2.4.12 
Also update the Infinality patches.

Note that FreeType 2.5 was released a few days ago, but I don't know
how stable it is.
 2013-06-21 18:44:33 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Eelco Dolstra
d4561be1cb fontconfig: Use /etc/fonts by default again 
This removes the need to set $FONTCONFIG_FILE, which is especially
important when using Nixpkgs binaries on non-NixOS systems.

See also 9301524c50.  This is a
regression caused by a change in fontconfig's configure switches.
 2013-05-07 13:03:25 +02:00
Vladimír Čunát
610796d9f2 freetype+fontconfig: add infinality and enable it 
Also add fontconfig checks
, change license to "unfree" if using patented code.

Inspired by Corey O'Connor in #89
27fec0aa26
 2013-02-10 14:44:14 +01:00
Vladimír Čunát
c53724f317 fontconfig: propagation no longer needed 2013-02-10 14:19:34 +01:00
Vladimír Čunát
944171bcf3 fontconfig: minor update 2013-01-29 14:55:14 +01:00
Eelco Dolstra
d8b7b65bb1 Slight cleanup 2012-09-26 15:07:43 -04:00
Eelco Dolstra
943346d9d0 fontconfig: Update to 2.10.1 2012-09-26 15:07:11 -04:00
Eelco Dolstra
8846bef013 * Fontconfig updated to 2.9.0. 
svn path=/nixpkgs/branches/x-updates/; revision=34130
 2012-05-15 22:04:47 +00:00
Eelco Dolstra
02d85d19a2 * Fontconfig updated to 2.8.0. 
svn path=/nixpkgs/branches/x-updates/; revision=22644
 2010-07-18 21:55:31 +00:00
Lluís Batlle i Rossell
8a115c13ad Fixing the fontconfig native build (cross-building related) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18658
 2009-11-26 21:26:42 +00:00
Lluís Batlle i Rossell
ca5d91aa60 Made more libraries cross compile. fontconfig, libxcb, bzip2, libdrm, zlib... 
I was trying to cross compile SDL. Many dependencies work, but I ended seeing
libX11 not ready for cross compilation. Other xorg libraries cross-compile
well. libX11 may need a small patch. The problem is the usual "configure test
cannot be run in cross compilation", so the configure script halts.

I made the pkgconfig expression always return buildDrv, as I think it rarely
will be needed as buildInput. So to avoid rewriting all its mentions to use
it as buildNativeInput, I prefered this small change.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18500
 2009-11-21 10:44:22 +00:00
Eelco Dolstra
27ab1e3cc7 svn path=/nixpkgs/branches/xorg-7.5/; revision=18044 2009-10-30 08:26:20 +00:00
Eelco Dolstra
db52ebcc98 * Urgh. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18037
 2009-10-29 18:17:58 +00:00
Eelco Dolstra
7133275ca0 * Purity: don't do a mkdir /var/cache/fontconfig. 
svn path=/nixpkgs/branches/xorg-7.5/; revision=18036
 2009-10-29 18:17:45 +00:00
Eelco Dolstra
9301524c50 * Fontconfig updated to 2.7.3. Use /etc/fonts as the default 
configuration directory so that users on other distributions don't
  need to set $FONTCONFIG_FILE (NIXPKGS-29).  Also use
  /var/cache/fontconfig for the cache to prevent programs run by root
  from writing into the Nix store.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18021
 2009-10-29 13:22:43 +00:00
Eelco Dolstra
077b0157a0 * Updated the generator to handle some missing dependencies. 
Also updated some X.org packages (notably xorg-server)
  as well as freetype.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15191
 2009-04-20 16:02:50 +00:00
Eelco Dolstra
cd60dc0ede * Various updates. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
 2008-06-12 09:49:40 +00:00
Eelco Dolstra
5ebab60b5e * Latest GTK+, glib, ATK, Pango, FreeType, Cairo, Fontconfig. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11017
 2008-03-07 15:43:43 +00:00