diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-26 21:04:36 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-26 21:04:36 +0000 |
commit | 9f173879e31108545421fe280b0c98aef8b679f6 (patch) | |
tree | aaa0c593288ca64e4f38500506df0645e8f03121 /pkgs/servers/x11/xorg | |
parent | 24399a3f49b1e4177878a8e1b85cf68e3b7536d1 (diff) | |
download | nixpkgs-9f173879e31108545421fe280b0c98aef8b679f6.tar nixpkgs-9f173879e31108545421fe280b0c98aef8b679f6.tar.gz nixpkgs-9f173879e31108545421fe280b0c98aef8b679f6.tar.bz2 nixpkgs-9f173879e31108545421fe280b0c98aef8b679f6.tar.lz nixpkgs-9f173879e31108545421fe280b0c98aef8b679f6.tar.xz nixpkgs-9f173879e31108545421fe280b0c98aef8b679f6.tar.zst nixpkgs-9f173879e31108545421fe280b0c98aef8b679f6.zip |
* Don't call fc-cache (it tries to write in fontconfig's prefix).
svn path=/nixpkgs/trunk/; revision=8056
Diffstat (limited to 'pkgs/servers/x11/xorg')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 32 | ||||
-rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 4 |
2 files changed, 19 insertions, 17 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 9487e447b36..73d27283c30 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -182,8 +182,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-adobe-utopia-type1-X11R7.0-1.0.1.tar.bz2; sha256 = "1dnmnma1l7likn1jlbnc5bavs5467ymm45lwdlvj4d5gv4qn59qb"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fontalias = (stdenv.mkDerivation { name = "font-alias-1.0.1"; @@ -252,8 +252,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-bh-ttf-X11R7.0-1.0.0.tar.bz2; sha256 = "1pwy9nzmmwipia4zgp23h95mds1zsh4xiac54x61x6x4058j8s52"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fontbhtype1 = (stdenv.mkDerivation { name = "font-bh-type1-1.0.0"; @@ -262,8 +262,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-bh-type1-X11R7.0-1.0.0.tar.bz2; sha256 = "1mc2a667s2p4kb5p31cyqdr07mpxcqyrvsvfsg1xd0rdx4adxkpp"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fontbitstream100dpi = (stdenv.mkDerivation { name = "font-bitstream-100dpi-1.0.0"; @@ -302,8 +302,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-bitstream-type1-X11R7.0-1.0.0.tar.bz2; sha256 = "0vgx360jb9q15kjy6ynll850h2kc0lv3s115b3n5nnc9i8wrvw7n"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fontcacheproto = (stdenv.mkDerivation { name = "fontcacheproto-0.1.2"; @@ -362,8 +362,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-ibm-type1-X11R7.0-1.0.0.tar.bz2; sha256 = "1z2wr67sjl3vsg3x87ja189w0x25ywvir3jddlxny5m2f7si0hjk"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fontisasmisc = (stdenv.mkDerivation { name = "font-isas-misc-1.0.0"; @@ -412,8 +412,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-misc-ethiopic-X11R7.0-1.0.0.tar.bz2; sha256 = "1na882sk7mmb0dhmypzgfj0sv35jf2dap34k6jg5brzlp22500h4"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fontmiscmeltho = (stdenv.mkDerivation { name = "font-misc-meltho-1.0.0"; @@ -422,8 +422,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-misc-meltho-X11R7.0-1.0.0.tar.bz2; sha256 = "0g95r9v7ixbr7120p3d99c2yvxlmj5a6lwb19rzb0pdrap0g1jya"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fontmiscmisc = (stdenv.mkDerivation { name = "font-misc-misc-1.0.0"; @@ -532,8 +532,8 @@ rec { url = http://mirror.switch.ch/ftp/mirror/X11/pub/X11R7.2/src/everything/font-xfree86-type1-X11R7.0-1.0.0.tar.bz2; sha256 = "0kzr8jqfqp8gm6vh391l16vlmyclz9ck9nw2f9zjaqnlwzbzx96d"; }; - buildInputs = [pkgconfig fontconfig mkfontdir mkfontscale ]; - }) // {inherit fontconfig mkfontdir mkfontscale ;}; + buildInputs = [pkgconfig mkfontdir mkfontscale ]; preInstall = "installFlags=(FCCACHE=true)"; + }) // {inherit mkfontdir mkfontscale ;}; fslsfonts = (stdenv.mkDerivation { name = "fslsfonts-1.0.1"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index f6429a77326..9e551ffd02c 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -147,7 +147,9 @@ while (<>) { } if ($file =~ /AC_PATH_PROG\(FCCACHE/) { - push @requires, "fontconfig"; + # Don't run fc-cache. + die if defined $extraAttrs{$pkg}; + $extraAttrs{$pkg} = " preInstall = \"installFlags=(FCCACHE=true)\"; "; } sub process { |