commit f961fc7dd13a724f332482234e126e4526bc2091 · pyrox.dev/nixpkgs

+1 -1

nixos/modules/config/fonts/fontconfig-ultimate.nix

···

       104
       104
        
               ultimate = {

     

       105
       105
        
                 enable = mkOption {

     

       106
       106
        
                   type = types.bool;

     

       107
       107
       -
                   default = false;

     

       107
       107
       +
                   default = true;

     

       108
       108
        
                   description = ''

     

       109
       109
        
                     Enable fontconfig-ultimate settings (formerly known as

     

       110
       110
        
                     Infinality). Besides the customizable settings in this NixOS

+1 -1

pkgs/development/compilers/openjdk/8.nix

···

       2
       2
        
       , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib

     

       3
       3
        
       , setJavaClassPath

     

       4
       4
        
       , minimal ? false

     

       5
       5
       -
       , enableInfinality ? false # font rendering patch

     

       5
       5
       +
       , enableInfinality ? true # font rendering patch

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

+18 -3

pkgs/development/libraries/freetype/default.nix

···

       1
       1
       -
       { stdenv, fetchurl, fetchpatch, pkgconfig, which, zlib, bzip2, libpng, gnumake

     

       1
       1
       +
       { stdenv, fetchurl, fetchFromGitHub, pkgconfig, which, zlib, bzip2, libpng, gnumake

     

       2
       2
        
       , glib /* passthru only */

     

       3
       3
        
       

     

       4
       4
        
         # FreeType supports sub-pixel rendering.  This is patented by

     

       5
       5
        
         # Microsoft, so it is disabled by default.  This option allows it to

     

       6
       6
        
         # be enabled.  See http://www.freetype.org/patents.html.

     

       7
       7
        
       , useEncumberedCode ? true

     

       8
       8
       +
       , useInfinality ? true

     

       8
       9
        
       }:

     

       9
       10
        
       

     

       11
       11
       +
       assert useInfinality -> useEncumberedCode;

     

       12
       12
       +
       

     

       10
       13
        
       let

     

       11
       14
        
         version = "2.6.5";

     

       15
       15
       +
       

     

       16
       16
       +
         infinality = fetchFromGitHub {

     

       17
       17
       +
           owner = "archfan";

     

       18
       18
       +
           repo = "infinality_bundle";

     

       19
       19
       +
           rev = "5c0949a477bf43d2ac4e57b4fc39bcc3331002ee";

     

       20
       20
       +
           sha256 = "17389aqm6rlxl4b5mv1fx4b22x2v2n60hfhixfxqxpd8ialsdi6l";

     

       21
       21
       +
         };

     

       22
       22
       +
       

     

       12
       23
        
       in

     

       13
       24
        
       with { inherit (stdenv.lib) optional optionals optionalString; };

     

       14
       25
        
       stdenv.mkDerivation rec {

     
···

       26
       37
        
             url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990";

     

       27
       38
        
             sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l";

     

       28
       39
        
           })

     

       29
       29
       -
         ] ++ optionals (useEncumberedCode) [

     

       40
       40
       +
         ] ++ optionals (!useInfinality && useEncumberedCode) [

     

       30
       41
        
           # Patch to enable subpixel rendering.

     

       31
       42
        
           # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html.

     

       32
       43
        
           (fetchurl {

     
···

       36
       47
        
           })

     

       37
       48
        
         ];

     

       38
       49
        
       

     

       50
       50
       +
         prePatch = optionalString useInfinality ''

     

       51
       51
       +
           patches="$patches $(ls ${infinality}/*_freetype2-iu/*-infinality-*.patch)"

     

       52
       52
       +
         '';

     

       53
       53
       +
       

     

       39
       54
        
         outputs = [ "dev" "out" ];

     

       40
       55
        
       

     

       41
       56
        
         propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype

     
···

       44
       59
        
           # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.

     

       45
       60
        
           ++ optional (!stdenv.isLinux) gnumake;

     

       46
       61
        
       

     

       47
       47
       -
         configureFlags = "--disable-static --bindir=$(dev)/bin";

     

       62
       62
       +
         configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];

     

       48
       63
        
       

     

       49
       64
        
         # The asm for armel is written with the 'asm' keyword.

     

       50
       65
        
         CFLAGS = optionalString stdenv.isArm "-std=gnu99";