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

fontconfig: drop infinality (for now), close #5140

Browse Source 
Also the simplify the expression when we rebuild anyway.
This commit is contained in:
Vladimír Čunát 2014-11-26 22:03:45 +01:00
parent 53fc3e178f
commit 3ef186bdb4
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/libraries/fontconfig/default.nix
View File

@ -23,22 +23,12 @@ stdenv.mkDerivation rec {
sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw"; sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw";
}; };
infinality_patch =
let subvers = "1";
in fetchurl {
url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;
sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";
}
;
patches = [ patches = [
(fetchpatch ({ (fetchpatch {
url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67"; name = "fc-cache-bug-77252.patch"; # TODO: collapse on mass rebuild
sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv"; url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67";
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv";
name = "fc-cache-bug-77252.patch"; # TODO: collapse on mass rebuild })
}
))
(substituteAll { (substituteAll {
src = ./config-compat.patch; src = ./config-compat.patch;
inherit configVersion; inherit configVersion;
@ -72,7 +62,7 @@ stdenv.mkDerivation rec {
installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";
postInstall = '' postInstall = ''
cd "$out/etc/fonts" && tar xvf ${infinality_patch} cd "$out/etc/fonts"
rm conf.d/{50-user,51-local}.conf rm conf.d/{50-user,51-local}.conf
"${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \
--stringparam fontconfig "$out" \ --stringparam fontconfig "$out" \