public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Refactoring: move fontconfig out of xlibs. 

svn path=/nixpkgs/trunk/; revision=4221
This commit is contained in:
Eelco Dolstra 2005-11-04 13:07:22 +00:00
parent 65a411cadc
commit e68763576b
4 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/xlibs/fontconfig/builder.sh → pkgs/development/libraries/fontconfig/builder.sh
View File

0
pkgs/development/libraries/xlibs/fontconfig/default.nix → pkgs/development/libraries/fontconfig/default.nix
View File

6
pkgs/development/libraries/xlibs/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, freetype, expat}: {stdenv, fetchurl, pkgconfig, freetype, fontconfig}:
rec { rec {
@ -46,10 +46,6 @@ rec {
inherit fetchurl stdenv pkgconfig libX11 renderext; inherit fetchurl stdenv pkgconfig libX11 renderext;
}; };
fontconfig = (import ./fontconfig) {
inherit fetchurl stdenv freetype expat;
};
libXft = (import ./libXft) { libXft = (import ./libXft) {
inherit fetchurl stdenv pkgconfig libX11 libXrender freetype fontconfig; inherit fetchurl stdenv pkgconfig libX11 libXrender freetype fontconfig;
}; };

34
pkgs/system/all-packages-generic.nix
View File

@ -829,8 +829,7 @@ rec {
}; };
cairo = (import ../development/libraries/cairo) { cairo = (import ../development/libraries/cairo) {
inherit fetchurl stdenv pkgconfig x11 freetype zlib libpng; inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
inherit (xlibs) fontconfig;
}; };
gtkLibs = gtkLibs28; gtkLibs = gtkLibs28;
@ -989,8 +988,12 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
fontconfig = import ../development/libraries/fontconfig {
inherit fetchurl stdenv freetype expat;
};
xlibs = (import ../development/libraries/xlibs) { xlibs = (import ../development/libraries/xlibs) {
inherit fetchurl stdenv pkgconfig freetype expat; inherit fetchurl stdenv pkgconfig freetype fontconfig;
}; };
# Xaw3d = import ../development/libraries/Xaw3d { # Xaw3d = import ../development/libraries/Xaw3d {
@ -1281,9 +1284,8 @@ rec {
}; };
xorg = import ../servers/x11/xorg { xorg = import ../servers/x11/xorg {
inherit fetchurl stdenv pkgconfig freetype # fontconfig inherit fetchurl stdenv pkgconfig freetype fontconfig
expat libdrm libpng zlib perl mesa; expat libdrm libpng zlib perl mesa;
inherit (xlibs) fontconfig;
}; };
postgresql = (import ../servers/sql/postgresql) { postgresql = (import ../servers/sql/postgresql) {
@ -1448,8 +1450,12 @@ rec {
### APPLICATIONS ### APPLICATIONS
openoffice = (import ../applications/office/openoffice) { openoffice = (import ../applications/office/openoffice) {
inherit fetchurl stdenv pam python tcsh libxslt perl perlArchiveZip perlCompressZlib zlib libjpeg expat pkgconfig freetype libwpd libxml2 db4 sablotron curl libsndfile flex zip unzip libmspack getopt file; inherit fetchurl stdenv pam python tcsh libxslt
inherit (xlibs) libXaw fontconfig; perl perlArchiveZip perlCompressZlib zlib libjpeg
expat pkgconfig freetype fontconfig libwpd libxml2
db4 sablotron curl libsndfile flex zip unzip libmspack
getopt file;
inherit (xlibs) libXaw;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
bison = (import ../development/tools/parsing/bison/bison-2.1.nix) { bison = (import ../development/tools/parsing/bison/bison-2.1.nix) {
@ -1669,11 +1675,11 @@ rec {
}; };
inkscape = (import ../applications/graphics/inkscape) { inkscape = (import ../applications/graphics/inkscape) {
inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib popt libxml2 libxslt libpng boehmgc; inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
inherit (gtkLibs) gtk; popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
inherit gtkmm glibmm libsigcxx; glibmm libsigcxx;
inherit (xlibs) libXft fontconfig; inherit (gtkLibs) gtk glib;
inherit (gnome) glib; inherit (xlibs) libXft;
}; };
fspot = (import ../applications/graphics/f-spot) { fspot = (import ../applications/graphics/f-spot) {
@ -1684,8 +1690,8 @@ rec {
}; };
gimp = (import ../applications/graphics/gimp) { gimp = (import ../applications/graphics/gimp) {
inherit fetchurl stdenv pkgconfig freetype libtiff libjpeg libpng libexif zlib perl perlXMLParser; inherit fetchurl stdenv pkgconfig freetype fontconfig
inherit (xlibs) fontconfig; libtiff libjpeg libpng libexif zlib perl perlXMLParser;
inherit (gnome) gtk libgtkhtml glib pango atk libart_lgpl; inherit (gnome) gtk libgtkhtml glib pango atk libart_lgpl;
}; };