mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 02:46:28 +00:00
Code Issues Wiki Activity
54766 commits 181 branches 125 tags 6.5 GiB
Commit graph

39 commits

Author SHA1 Message Date
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
Eelco Dolstra 3e19819c28 * X11R7.2 and associated updates. 
svn path=/nixpkgs/trunk/; revision=8049
 2007-02-26 16:32:27 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl. 
svn path=/nixpkgs/trunk/; revision=4623
 2006-01-30 16:04:03 +00:00
Eelco Dolstra e68763576b * Refactoring: move fontconfig out of xlibs. 
svn path=/nixpkgs/trunk/; revision=4221
 2005-11-04 13:07:22 +00:00
Eelco Dolstra 00004fa6da * More freedesktop.org X11 modules. 
* Cleaned up some packages.

svn path=/nixpkgs/trunk/; revision=883
 2004-03-30 17:28:41 +00:00
Eelco Dolstra 12ae5363ea * Remove trivial builders. 
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
 2004-03-29 17:23:01 +00:00
Eelco Dolstra 2fcc5fdb08 * "!isNull x" -> "x != null". Done automatically. Hope nothing 
broke.

svn path=/nixpkgs/trunk/; revision=870
 2004-03-29 10:25:25 +00:00
Eelco Dolstra 026ff9466a * Rename .fix -> .nix. 
svn path=/nixpkgs/trunk/; revision=511
 2003-11-18 12:12:56 +00:00
Renamed from pkgs/development/libraries/fontconfig/default.fix (Browse further)