Commit Graph

70 Commits

Author SHA1 Message Date
Jan Tojnar
3665a31a4a
Merge pull request #67663 from jtojnar/fc-joypixels
fontconfig: add support for JoyPixels font
2019-08-30 00:30:13 +02:00
Jan Tojnar
37018e70d1
fontconfig: add support for JoyPixels font
Mirroring the following upstream merge request
https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
2019-08-29 02:15:26 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
eburimu
36e2e9dd33 fontconfig: use native xsltproc in case of cross compilation
Fixes #50801
2018-11-21 01:48:23 -06:00
John Ericson
0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
John Ericson
5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson
330ca731e8 treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
John Ericson
7d0906eea8 fontconfig: Clean up cross 2018-05-10 01:57:49 -04:00
John Ericson
feb648ce59 Merge commit '70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff' into lib-platform-simplify 2018-05-10 01:40:38 -04:00
John Ericson
a02be2bd85 treewide: Get rid of *Platform.arch
Use `parsed.cpu.name` or `platform.gcc.arch` instead.
2018-05-10 01:37:31 -04:00
Nikolay Amiantov
a536aee981 fontconfig: 2.12.1 -> 2.12.6 2018-03-06 13:09:19 +03:00
Hamish Mackenzie
6ad745209f
fontconfig: Fix for HFS+ 1s date resolution issue
HFS+ (still common on macOS machines) only has a
date resolution of 1 second.  This change makes sure that
`fcobjshash.h` gets a newer timestamp than `fcobjshash.gperf`.
2018-02-12 21:10:20 +13:00
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