diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index eee912d1b8c..49e71614bf9 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2364,11 +2364,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.1"; + name = "xorg-server-1.19.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2; - sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2; + sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg"; }; buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 310bebd382a..c7a4ff20a73 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -394,6 +394,11 @@ in let attrs = with args; if (args.abiCompat == null) then attrs_passed + # All this just for 1.19.2, as the tarball is incorrectly autotoolized. + // { + nativeBuildInputs = [ utilmacros fontutil ]; + preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi"; + } else if (args.abiCompat == "1.17") then { name = "xorg-server-1.17.4"; builder = ./builder.sh;