diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2018-03-06 13:02:13 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-06 13:09:19 +0300 |
| commit | 3a28cc1dcd9432c62d46bda6de380b30f6d2e12f (patch) | |
| tree | 985b728151af1619a488d096258dccf75435c9c1 /pkgs/development/libraries/freetype/default.nix | |
| parent | a536aee981fb20670b03a55357719dd771e780c2 (diff) | |
| download | nixpkgs-3a28cc1dcd9432c62d46bda6de380b30f6d2e12f.tar nixpkgs-3a28cc1dcd9432c62d46bda6de380b30f6d2e12f.tar.gz nixpkgs-3a28cc1dcd9432c62d46bda6de380b30f6d2e12f.tar.bz2 nixpkgs-3a28cc1dcd9432c62d46bda6de380b30f6d2e12f.tar.lz nixpkgs-3a28cc1dcd9432c62d46bda6de380b30f6d2e12f.tar.xz nixpkgs-3a28cc1dcd9432c62d46bda6de380b30f6d2e12f.tar.zst nixpkgs-3a28cc1dcd9432c62d46bda6de380b30f6d2e12f.zip | |
freetype: 2.7.1 -> 2.9
Diffstat (limited to 'pkgs/development/libraries/freetype/default.nix')
| -rw-r--r-- | pkgs/development/libraries/freetype/default.nix | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 8f16f85cabf..cd7ac64da15 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -11,10 +11,10 @@ let inherit (stdenv.lib) optional optionals optionalString; - version = "2.7.1"; name = "freetype-" + version; -in stdenv.mkDerivation { - inherit name; +in stdenv.mkDerivation rec { + name = "freetype-${version}"; + version = "2.9"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.bz2"; - sha256 = "121gm15ayfg3rglby8ifh8384mcjb9dhmx9j40zl7yszw72b4frs"; + sha256 = "12jcdz1in20yaa55izxalg3hm1pf7nydfrzps5bzb4zgihybmzz6"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype @@ -43,14 +43,7 @@ in stdenv.mkDerivation { ++ optional (!stdenv.isLinux) gnumake; patches = - [ - ./pcf-introduce-driver.patch - ./pcf-config-long-family-names.patch - ./disable-pcf-long-family-names.patch - ./enable-table-validation.patch - # remove the two CVE patches after updating to >= 2.8 - ./cve-2017-8105.patch - ./cve-2017-8287.patch + [ ./enable-table-validation.patch ] ++ optional useEncumberedCode ./enable-subpixel-rendering.patch; |