Commit graph

38 commits

Author SHA1 Message Date
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
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 d051b20a39 * Graphviz updated to 2.20.2. Now built with fontconfig, gd and pango
support.
* New function makeFontsConf to generate a fontconfig configuration
  file.  Moved from NixOS.
* dot2pdf: use makeFontsConf to generate a fonts.conf containing just
  the Ghostscript fonts (see NIXPKGS-29).
* dot2pdf: generate PDF directly, don't go through PS.  Note that this
  and using fontconfig changes the interpretation of "fontname"
  attributes in dot graphs.

svn path=/nixpkgs/trunk/; revision=12251
2008-07-03 14:27:19 +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
Armijn Hemel ee6d188d7b fontconfig: don't build docs
libjpeg: get patches from new location

svn path=/nixpkgs/trunk/; revision=6444
2006-09-01 17:28:25 +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 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +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 5941f66f0e * The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
2004-03-19 16:53:04 +00:00
Eelco Dolstra d74192ee38 * propagated-build-inputs should now be placed in $out/nix-support.
svn path=/nixpkgs/trunk/; revision=823
2004-03-09 10:59:55 +00:00
Eelco Dolstra 026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Eelco Dolstra 48c3faca51 * Renamed pkgs-ng to pkgs.
svn path=/nixpkgs/trunk/; revision=502
2003-11-14 09:59:13 +00:00