diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:51:46 +0200 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-09-11 10:53:31 +0200 |
| commit | 1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304 (patch) | |
| tree | 3513b616eec434d455177a877119cdd96a7b4ade /pkgs/development/libraries/freetype | |
| parent | 2d405ed4d54ba4d924b5146cea4a39ae65343d59 (diff) | |
| parent | aa8e8303e1b42c5cf5195f3ce82f886664aa26d4 (diff) | |
| download | nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.gz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.bz2 nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.lz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.xz nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.tar.zst nixpkgs-1a55c4b89f6f6e337d1ca8878bfd8104f3fb6304.zip | |
Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/libpng/default.nix pkgs/development/libraries/pango/default.nix pkgs/tools/typesetting/tex/texlive/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/freetype')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index b2e39e41a0b..2c8839ba619 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -10,17 +10,7 @@ assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense let - version = "2.4.11"; - - infinality = rec { - inherit useInfinality; - vers = "20130104"; - subvers = "04"; - sha256 = "0dqglig34lfcw0w6sm6vmich0pcvq303vyh8jzqapvxgvrpr2156"; - - base_URL = "http://www.infinality.net/fedora/linux/zips"; - url = "${base_URL}/freetype-infinality-${version}-${vers}_${subvers}-x86_64.tar.bz2"; - }; + version = "2.4.12"; in @@ -29,16 +19,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "0gxyzxqpyf8g85y6g1zc1wqrh71prbbk8xfw4m8rwzb4ck5hp7gg"; + sha256 = "10akr2c37iv9y7fkgwp2szgwjyl2g6qmk9z1m596iaw9cr41g2m7"; }; outputs = [ "dev" "out" ]; configureFlags = "--disable-static --bindir=$(dev)/bin"; - infinality_patch = if useInfinality - then fetchurl { inherit (infinality) url sha256; } - else null; + infinality_patch = + if useInfinality then fetchurl { + url = http://www.infinality.net/fedora/linux/zips/freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2; + sha256 = "1lg2nzvxmwzwdfhxranw8iyflhr72cw9p11rkpgq1scxbp37668m"; + } else null; NIX_CFLAGS_COMPILE = with stdenv.lib; " -fno-strict-aliasing" # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840 @@ -72,7 +64,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-static CC_BUILD=gcc"; }; - passthru = { inherit infinality; }; # for fontconfig + passthru.infinality.useInfinality = useInfinality; # for fontconfig meta = { description = "A font rendering engine"; |