JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,370 Commits 1 Branch 0 Tags 12 GiB
cdaf55a961
Commit Graph

69 Commits

Author SHA1 Message Date
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
2c51a075ab makeFontsConf: fix with multiple outputs 2016-02-03 16:57:41 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
Nikolay Amiantov
7bd9a5b104 fontconfig: reorder cache dirs 2016-01-29 16:35:59 +03:00
Nikolay Amiantov
893af77556 makeFontsCache: init 2016-01-29 14:41:26 +03:00
Tuomas Tynkkynen
ca2cb493fa fontconfig_210: Split into multiple outputs 2015-10-28 10:17:10 +01: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
Thomas Tuegel
322bb7a67b fontconfig: include user config through NixOS module 2014-12-08 10:55:24 -06: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
Vladimír Čunát
b16994f7ce fontconfig: stop using xml:space; vital for nixos+2.11 
This is a proper fix for problems described in ec985c8ffa .
The code is from @lethalman.
 2014-09-28 16:57:47 +02:00
Vladimír Čunát
9217c7995c makeFontsConf: give up fontDirectories checks for now 
This reverts e26188938c and 77487fe661
CC #3515.
 2014-08-11 13:53:40 +02:00
Vladimír Čunát
77487fe661 makeFontsConf: fixup to accept older font packages 
They contain fonts on the silly path lib/X11/fonts/
 2014-08-11 13:07:59 +02:00
Vladimír Čunát
e26188938c makeFontsConf: check for share/fonts/ in fontDirectories 
Fixes #3515.
 2014-08-10 11:47:07 +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
Eelco Dolstra
5ae8ed381c Shut up warning about missing fonts.dtd 2014-04-29 12:27:03 +02:00
Kirill Elagin
8dc287b88c Let users install fonts to their HOME directory 2014-04-29 12:27:03 +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
be70104a3a Merge master into x-updates 
Conflicts (taken master):
	pkgs/development/compilers/llvm/3.4/llvm.nix
 2014-02-04 22:00:09 +01:00
Vladimír Čunát
ec985c8ffa fontconfig: stop using xml:space; vital for nixos+2.11 
Since fontconfig-2.11 the xml:space attribute makes it reject
/etc/fonts/fonts.conf, so it renders garbage and eats lots of CPU.

To use anything linked to fontconfig-2.11 you need to have this patch
applied to your running NixOS. That's why I'm pushing it to master
before the fontconfig update (as soon as I found and tested the fix).
 2014-02-04 21:58:19 +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
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates 
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
 2013-08-02 18:30:53 +02:00
Eelco Dolstra
989c58eb29 Process /etc/fonts/conf.d before upstream fonts/conf.d 
Otherwise the user won't be able to override anything specified in
NixOS' /etc/fonts/conf.d, since ~/.config/fontconfig is included from
upstream fonts/conf.5/50-user.conf.
 2013-06-27 13:31:35 +02: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