···

       
174
       
 
       
    of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.

     

       
175
       
 
       
    </para>

     

       
176
       
 
       
  </listitem>

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
177
       
 
       
</itemizedlist>

     

       
178
       
 
       


     

       
179
       
 
       


     

···

       
174
       
 
       
    of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.

     

       
175
       
 
       
    </para>

     

       
176
       
 
       
  </listitem>

     

       
177
       
+
       


     

       
178
       
+
       
  <listitem>

     

       
179
       
+
       
    <para><literal>services.xserver.vaapiDrivers</literal> has been removed. Use

     

       
180
       
+
       
    <literal>services.hardware.opengl.extraPackages{,32}</literal> instead. You can

     

       
181
       
+
       
    also specify VDPAU drivers there.</para>

     

       
182
       
+
       
  </listitem>

     

       
183
       
 
       
</itemizedlist>

     

       
184
       
 
       


     

       
185
       
 
       


     

···

       
93
       
 
       
    hardware.opengl.extraPackages = mkOption {

     

       
94
       
 
       
      type = types.listOf types.package;

     

       
95
       
 
       
      default = [];

     

       
0
       
 
       

     

       
96
       
 
       
      description = ''

     

       
97
       
-
       
        Additional packages to add to OpenGL drivers.

     

       
0
       
 
       

     

       
98
       
 
       
      '';

     

       
99
       
 
       
    };

     

       
100
       
 
       


     

       
101
       
 
       
    hardware.opengl.extraPackages32 = mkOption {

     

       
102
       
 
       
      type = types.listOf types.package;

     

       
103
       
 
       
      default = [];

     

       
0
       
 
       

     

       
104
       
 
       
      description = ''

     

       
105
       
 
       
        Additional packages to add to 32-bit OpenGL drivers on

     

       
106
       
 
       
        64-bit systems. Used when <option>driSupport32Bit</option> is

     

       
107
       
-
       
        set.

     

       
108
       
 
       
      '';

     

       
109
       
 
       
    };

     

       
110
       
 
       


     

···

       
93
       
 
       
    hardware.opengl.extraPackages = mkOption {

     

       
94
       
 
       
      type = types.listOf types.package;

     

       
95
       
 
       
      default = [];

     

       
96
       
+
       
      example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]";

     

       
97
       
 
       
      description = ''

     

       
98
       
+
       
        Additional packages to add to OpenGL drivers. This can be used

     

       
99
       
+
       
        to add additional VA-API/VDPAU drivers.

     

       
100
       
 
       
      '';

     

       
101
       
 
       
    };

     

       
102
       
 
       


     

       
103
       
 
       
    hardware.opengl.extraPackages32 = mkOption {

     

       
104
       
 
       
      type = types.listOf types.package;

     

       
105
       
 
       
      default = [];

     

       
106
       
+
       
      example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]";

     

       
107
       
 
       
      description = ''

     

       
108
       
 
       
        Additional packages to add to 32-bit OpenGL drivers on

     

       
109
       
 
       
        64-bit systems. Used when <option>driSupport32Bit</option> is

     

       
110
       
+
       
        set. This can be used to add additional VA-API/VDPAU drivers.

     

       
111
       
 
       
      '';

     

       
112
       
 
       
    };

     

       
113
       
 
       


     

···

       
77
       
 
       
    (mkRenamedOptionModule [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])

     

       
78
       
 
       
    (mkRenamedOptionModule [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ])

     

       
79
       
 
       
    (mkRenamedOptionModule [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ])

     

       
0
       
 
       

     

       
80
       
 
       


     

       
81
       
 
       
    (mkRenamedOptionModule [ "services" "mysql55" ] [ "services" "mysql" ])

     

       
82
       
 
       


     

···

       
77
       
 
       
    (mkRenamedOptionModule [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])

     

       
78
       
 
       
    (mkRenamedOptionModule [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ])

     

       
79
       
 
       
    (mkRenamedOptionModule [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ])

     

       
80
       
+
       
    (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ])

     

       
81
       
 
       


     

       
82
       
 
       
    (mkRenamedOptionModule [ "services" "mysql55" ] [ "services" "mysql" ])

     

       
83
       
 
       


     

···

       
16
       
 
       
  cfg = config.services.xserver;

     

       
17
       
 
       
  xorg = pkgs.xorg;

     

       
18
       
 
       


     

       
19
       
-
       
  vaapiDrivers = pkgs.buildEnv {

     

       
20
       
-
       
    name = "vaapi-drivers";

     

       
21
       
-
       
    paths = cfg.vaapiDrivers;

     

       
22
       
-
       
    # We only want /lib/dri, but with a single input path, we need "/" for it to work

     

       
23
       
-
       
    pathsToLink = [ "/" ];

     

       
24
       
-
       
  };

     

       
25
       
-
       


     

       
26
       
 
       
  fontconfig = config.fonts.fontconfig;

     

       
27
       
 
       
  xresourcesXft = pkgs.writeText "Xresources-Xft" ''

     

       
28
       
 
       
    ${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${toString fontconfig.dpi}''}

     
···

       
106
       
 
       
      elif test -e ~/.Xdefaults; then

     

       
107
       
 
       
          ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults

     

       
108
       
 
       
      fi

     

       
109
       
-
       


     

       
110
       
-
       
      export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri

     

       
111
       
 
       


     

       
112
       
 
       
      # Speed up application start by 50-150ms according to

     

       
113
       
 
       
      # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html

     

···

       
16
       
 
       
  cfg = config.services.xserver;

     

       
17
       
 
       
  xorg = pkgs.xorg;

     

       
18
       
 
       


     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
19
       
 
       
  fontconfig = config.fonts.fontconfig;

     

       
20
       
 
       
  xresourcesXft = pkgs.writeText "Xresources-Xft" ''

     

       
21
       
 
       
    ${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${toString fontconfig.dpi}''}

     
···

       
99
       
 
       
      elif test -e ~/.Xdefaults; then

     

       
100
       
 
       
          ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults

     

       
101
       
 
       
      fi

     

       
0
       
 
       

     

       
0
       
 
       

     

       
102
       
 
       


     

       
103
       
 
       
      # Speed up application start by 50-150ms according to

     

       
104
       
 
       
      # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html

     

···

       
216
       
 
       
        '';

     

       
217
       
 
       
      };

     

       
218
       
 
       


     

       
219
       
-
       
      vaapiDrivers = mkOption {

     

       
220
       
-
       
        type = types.listOf types.path;

     

       
221
       
-
       
        default = [ ];

     

       
222
       
-
       
        example = literalExample "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";

     

       
223
       
-
       
        description = ''

     

       
224
       
-
       
          Packages providing libva acceleration drivers.

     

       
225
       
-
       
        '';

     

       
226
       
-
       
      };

     

       
227
       
-
       


     

       
228
       
 
       
      startGnuPGAgent = mkOption {

     

       
229
       
 
       
        type = types.bool;

     

       
230
       
 
       
        default = false;

     

···

       
216
       
 
       
        '';

     

       
217
       
 
       
      };

     

       
218
       
 
       


     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
219
       
 
       
      startGnuPGAgent = mkOption {

     

       
220
       
 
       
        type = types.bool;

     

       
221
       
 
       
        default = false;