commit a03ff26080488d40c4d493aa9386460728fb8fd5 · pyrox.dev/nixpkgs

+4

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

···

       16
       16
        
           See <xref linkend="sec-booting-from-pxe" /> for documentation.</para>

     

       17
       17
        
         </listitem>

     

       18
       18
        
       

     

       19
       19
       +
         <listitem>

     

       20
       20
       +
           <para>Xorg-server-1.18.*. If you choose <literal>"ati_unfree"</literal> driver,

     

       21
       21
       +
           1.17.* is still used due to ABI incompatibility.</para>

     

       22
       22
       +
         </listitem>

     

       19
       23
        
       </itemizedlist>

     

       20
       24
        
       

     

       21
       25
        
       <para>The following new services were added since the last release:</para>

+2

nixos/modules/hardware/video/ati.nix

···

       18
       18
        
       

     

       19
       19
        
         config = mkIf enabled {

     

       20
       20
        
       

     

       21
       21
       +
           nixpkgs.config.xorg.fglrxCompat = true;

     

       22
       22
       +
       

     

       21
       23
        
           services.xserver.drivers = singleton

     

       22
       24
        
             { name = "fglrx"; modules = [ ati_x11 ]; libPath = [ "${ati_x11}/lib" ]; };

     

       23
       25

+10 -2

nixos/modules/services/x11/xserver.nix

···

       463
       463
        
                 { source = "${cfg.xkbDir}";

     

       464
       464
        
                   target = "X11/xkb";

     

       465
       465
        
                 }

     

       466
       466
       -
               ]);

     

       466
       466
       +
               ])

     

       467
       467
       +
             # Needed since 1.18; see https://bugs.freedesktop.org/show_bug.cgi?id=89023#c5

     

       468
       468
       +
             ++ (let cfgPath = "/X11/xorg.conf.d/10-evdev.conf"; in

     

       469
       469
       +
               [{

     

       470
       470
       +
                 source = xorg.xf86inputevdev.out + "/share" + cfgPath;

     

       471
       471
       +
                 target = cfgPath;

     

       472
       472
       +
               }]

     

       473
       473
       +
             );

     

       467
       474
        
       

     

       468
       475
        
           environment.systemPackages =

     

       469
       476
        
             [ xorg.xorgserver.out

     
···

       479
       486
        
               xorg.xauth

     

       480
       487
        
               pkgs.xterm

     

       481
       488
        
               pkgs.xdg_utils

     

       489
       489
       +
               xorg.xf86inputevdev.out # get evdev.4 man page

     

       482
       490
        
             ]

     

       483
       491
        
             ++ optional (elem "virtualbox" cfg.videoDrivers) xorg.xrefresh;

     

       484
       492
        
       

     
···

       538
       546
        
           services.xserver.modules =

     

       539
       547
        
             concatLists (catAttrs "modules" cfg.drivers) ++

     

       540
       548
        
             [ xorg.xorgserver.out

     

       541
       541
       -
               xorg.xf86inputevdev

     

       549
       549
       +
               xorg.xf86inputevdev.out

     

       542
       550
        
             ];

     

       543
       551
        
       

     

       544
       552
        
           services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";

+1 -1

pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix

···

       36
       36
        
         ];

     

       37
       37
        
         NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];

     

       38
       38
        
         cmakeFlags = [

     

       39
       39
       -
           "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg"

     

       39
       39
       +
           "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"

     

       40
       40
        
           "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"

     

       41
       41
        
         ];

     

       42
       42
        
         postInstall = ''

+3 -3

pkgs/servers/x11/xorg/default.nix

···

       2339
       2339
        
         }) // {inherit ;};

     

       2340
       2340
        
       

     

       2341
       2341
        
         xorgserver = (mkDerivation "xorgserver" {

     

       2342
       2342
       -
           name = "xorg-server-1.17.4";

     

       2342
       2342
       +
           name = "xorg-server-1.18.3";

     

       2343
       2343
        
           builder = ./builder.sh;

     

       2344
       2344
        
           src = fetchurl {

     

       2345
       2345
       -
             url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2;

     

       2346
       2346
       -
             sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";

     

       2345
       2345
       +
             url = mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2;

     

       2346
       2346
       +
             sha256 = "1ka206v4nbw6qz072gh0543aq44azq2zv9f0yysy5nvwa4i9qwza";

     

       2347
       2347
        
           };

     

       2348
       2348
        
           buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];

     

       2349
       2349
        
           meta.platforms = stdenv.lib.platforms.unix;

+17 -1

pkgs/servers/x11/xorg/overrides.nix

···

       286
       286
        
         };

     

       287
       287
        
       

     

       288
       288
        
         xf86inputevdev = attrs: attrs // {

     

       289
       289
       +
           outputs = [ "dev" "out" ]; # to get rid of xorgserver.dev; man is tiny

     

       289
       290
        
           preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";

     

       290
       291
        
           installFlags = "sdkdir=\${out}/include/xorg";

     

       291
       292
        
           buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ];

     
···

       364
       365
        
           '';

     

       365
       366
        
         };

     

       366
       367
        
       

     

       367
       367
       -
         xorgserver = with xorg; attrs: attrs //

     

       368
       368
       +
         xorgserver = with xorg; attrs_passed:

     

       369
       369
       +
           # exchange attrs if fglrxCompat is set

     

       370
       370
       +
           let

     

       371
       371
       +
             attrs = if !args.fglrxCompat then attrs_passed else

     

       372
       372
       +
               with args; {

     

       373
       373
       +
                 name = "xorg-server-1.17.4";

     

       374
       374
       +
                 builder = ./builder.sh;

     

       375
       375
       +
                 src = fetchurl {

     

       376
       376
       +
                   url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2;

     

       377
       377
       +
                   sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc";

     

       378
       378
       +
                 };

     

       379
       379
       +
                 buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];

     

       380
       380
       +
                 meta.platforms = stdenv.lib.platforms.unix;

     

       381
       381
       +
               };

     

       382
       382
       +
       

     

       383
       383
       +
           in attrs //

     

       368
       384
        
           (let

     

       369
       385
        
             version = (builtins.parseDrvName attrs.name).version;

     

       370
       386
        
             commonBuildInputs = attrs.buildInputs ++ [ xtrans ];

+1 -1

pkgs/servers/x11/xorg/tarballs-7.7.list

···

       183
       183
        
       mirror://xorg/individual/app/xmag-1.0.6.tar.bz2

     

       184
       184
        
       mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2

     

       185
       185
        
       mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2

     

       186
       186
       -
       mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2

     

       186
       186
       +
       mirror://xorg/individual/xserver/xorg-server-1.18.3.tar.bz2

     

       187
       187
        
       mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2

     

       188
       188
        
       mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2

     

       189
       189
        
       mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

+1

pkgs/top-level/all-packages.nix

···

       10329
       10329
        
           mesa = mesa_noglu;

     

       10330
       10330
        
           udev = if stdenv.isLinux then udev else null;

     

       10331
       10331
        
           libdrm = if stdenv.isLinux then libdrm else null;

     

       10332
       10332
       +
           fglrxCompat = config.xorg.fglrxCompat or false; # `config` because we have no `xorg.override`

     

       10332
       10333
        
         } // { inherit xlibsWrapper; } );

     

       10333
       10334
        
       

     

       10334
       10335
        
         xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };