commit b52acfdf0178a3bd3cd3b359dc9dbc354992aff3 · pyrox.dev/nixpkgs

+6

nixos/doc/manual/release-notes/rl-unstable.xml

···

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

     

       175
       175
        
           </para>

     

       176
       176
        
         </listitem>

     

       177
       177
       +
       

     

       178
       178
       +
         <listitem>

     

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

     

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

     

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

     

       182
       182
       +
         </listitem>

     

       177
       183
        
       </itemizedlist>

     

       178
       184
        
       

     

       179
       185

+5 -2

nixos/modules/hardware/opengl.nix

···

       93
       93
        
           hardware.opengl.extraPackages = mkOption {

     

       94
       94
        
             type = types.listOf types.package;

     

       95
       95
        
             default = [];

     

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

     

       96
       97
        
             description = ''

     

       97
       97
       -
               Additional packages to add to OpenGL drivers.

     

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

     

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

     

       98
       100
        
             '';

     

       99
       101
        
           };

     

       100
       102
        
       

     

       101
       103
        
           hardware.opengl.extraPackages32 = mkOption {

     

       102
       104
        
             type = types.listOf types.package;

     

       103
       105
        
             default = [];

     

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

     

       104
       107
        
             description = ''

     

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

     

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

     

       107
       107
       -
               set.

     

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

     

       108
       111
        
             '';

     

       109
       112
        
           };

     

       110
       113

+1

nixos/modules/rename.nix

···

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

     

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

     

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

     

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

     

       80
       81
        
       

     

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

     

       82
       83

-9

nixos/modules/services/x11/display-managers/default.nix

···

       16
       16
        
         cfg = config.services.xserver;

     

       17
       17
        
         xorg = pkgs.xorg;

     

       18
       18
        
       

     

       19
       19
       -
         vaapiDrivers = pkgs.buildEnv {

     

       20
       20
       -
           name = "vaapi-drivers";

     

       21
       21
       -
           paths = cfg.vaapiDrivers;

     

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

     

       23
       23
       -
           pathsToLink = [ "/" ];

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       19
        
         fontconfig = config.fonts.fontconfig;

     

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

     

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

     
···

       106
       99
        
             elif test -e ~/.Xdefaults; then

     

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

     

       108
       101
        
             fi

     

       109
       109
       -
       

     

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

     

       111
       102
        
       

     

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

     

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

-9

nixos/modules/services/x11/xserver.nix

···

       216
       216
        
               '';

     

       217
       217
        
             };

     

       218
       218
        
       

     

       219
       219
       -
             vaapiDrivers = mkOption {

     

       220
       220
       -
               type = types.listOf types.path;

     

       221
       221
       -
               default = [ ];

     

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

     

       223
       223
       -
               description = ''

     

       224
       224
       -
                 Packages providing libva acceleration drivers.

     

       225
       225
       -
               '';

     

       226
       226
       -
             };

     

       227
       227
       -
       

     

       228
       219
        
             startGnuPGAgent = mkOption {

     

       229
       220
        
               type = types.bool;

     

       230
       221
        
               default = false;