diff options
Diffstat (limited to 'pkgs/servers/x11/xorg')
-rw-r--r-- | pkgs/servers/x11/xorg/default.nix | 6 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 37 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/tarballs.list | 2 | ||||
-rw-r--r-- | pkgs/servers/x11/xorg/xwayland.nix | 31 |
4 files changed, 65 insertions, 11 deletions
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index bf6c041205e43..8566c8c61749a 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3898,11 +3898,11 @@ self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xkeyboardconfig = callPackage ({ stdenv, pkg-config, fetchurl, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xkeyboard-config"; - version = "2.41"; + version = "2.42"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz"; - sha256 = "13vjvyg1fjvsqzqkpxzigvv94v154mcb2gba4d80spi9aywxcb7h"; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz"; + sha256 = "01q8gs7lnx9d7iz29pal7a3whz7njmgjcpzhy82wa7zhq6znxc56"; }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 246709dd1c1cd..c7586b47ceaaf 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -3,7 +3,7 @@ automake, autoconf, libiconv, libtool, intltool, gettext, python3, perl, freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, netbsd, - ncompress, + ncompress, updateAutotoolsGnuConfigScriptsHook, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, mcpp, libepoxy, openssl, pkg-config, llvm, libxslt, libxcrypt, hwdata, ApplicationServices, Carbon, Cocoa, Xplugin, @@ -422,6 +422,10 @@ self: super: # https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/blob/master/configure.ac#L108-114 platforms = lib.fold (os: ps: ps ++ lib.platforms.${os}) [] [ "cygwin" "freebsd" "linux" "netbsd" "openbsd" "illumos" ]; + badPlatforms = [ + # mandatory shared library + lib.systems.inspect.platformPatterns.isStatic + ]; }; }); @@ -632,7 +636,7 @@ self: super: xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { prePatch = '' - patchShebangs rules/merge.py rules/compat/map-variants.py rules/xml2lst.pl + patchShebangs rules/merge.py rules/compat/map-variants.py rules/generate-options-symbols.py rules/xml2lst.pl ''; nativeBuildInputs = attrs.nativeBuildInputs ++ [ meson @@ -831,6 +835,7 @@ self: super: buildInputs = commonBuildInputs ++ [ bootstrap_cmds automake autoconf Xplugin Carbon Cocoa + mesa ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM xorgproto @@ -900,8 +905,36 @@ self: super: }; })); + # xvfb is used by a bunch of things to run tests + # and doesn't support hardware accelerated rendering + # so remove it from the rebuild heavy path for mesa + xvfb = super.xorgserver.overrideAttrs(old: { + configureFlags = [ + "--enable-xvfb" + "--disable-xorg" + "--disable-xquartz" + "--disable-xwayland" + "--disable-glamor" + "--disable-glx" + "--disable-dri" + "--disable-dri2" + "--disable-dri3" + "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" + "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" + ]; + + buildInputs = old.buildInputs ++ (with xorg; [ + pixman + libXfont2 + xtrans + libxcvt + ]); + }); + lndir = super.lndir.overrideAttrs (attrs: { buildInputs = []; + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; preConfigure = '' export XPROTO_CFLAGS=" " export XPROTO_LIBS=" " diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index f58c526f7defe..8305e15740409 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -73,7 +73,7 @@ mirror://xorg/individual/app/xwininfo-1.1.6.tar.xz mirror://xorg/individual/app/xwud-1.0.6.tar.xz mirror://xorg/individual/data/xbitmaps-1.1.3.tar.xz mirror://xorg/individual/data/xcursor-themes-1.0.7.tar.xz -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.42.tar.xz mirror://xorg/individual/doc/xorg-docs-1.7.3.tar.xz mirror://xorg/individual/doc/xorg-sgml-doctools-1.12.1.tar.xz mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index a34e1285e3071..11913a39e017b 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,8 +1,10 @@ { egl-wayland , libepoxy , fetchurl +, fetchpatch , fontutil , lib +, libdecor , libei , libGL , libGLU @@ -32,6 +34,7 @@ , pkg-config , pixman , stdenv +, systemd , wayland , wayland-protocols , wayland-scanner @@ -46,13 +49,30 @@ stdenv.mkDerivation rec { pname = "xwayland"; - version = "23.2.6"; + version = "24.1.0"; src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - hash = "sha256-HJo2a058ytug+b0xPFnq4S0jvXJUOyKibq+LIINc/G0="; + hash = "sha256-vvIcTxiAek7VccTi32CrY7VGa71QLszrJIW4kqt23MI="; }; + patches = [ + # Backport fix for pkg-config generation to make CMake happy + # FIXME: remove when merged + # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1543 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/8cb1c21a4240a5b6bf4aeeef51819639b4e0ad24.patch"; + hash = "sha256-MZPP9QgYO4RFJ/vcjkpu7SVSo5Dh09ZdZjOwTopjdYQ="; + }) + # Backport fix for segfault when linux-dmabuf device is not accessible + # FIXME: remove when merged + # Upstream PR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1565 + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/7605833315c05488eca30ed0a70a2a1430e89bbc.patch"; + hash = "sha256-4/A6aOiOGouPe2v4wIYDQY9rWkuNZJwk0h4gpfrl6hI="; + }) + ]; + depsBuildBuild = [ pkg-config ]; @@ -64,6 +84,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ egl-wayland + libdecor libepoxy libei fontutil @@ -90,6 +111,7 @@ stdenv.mkDerivation rec { mesa openssl pixman + systemd wayland wayland-protocols xkbcomp @@ -100,7 +122,6 @@ stdenv.mkDerivation rec { libunwind ]; mesonFlags = [ - (lib.mesonBool "xwayland_eglstream" true) (lib.mesonBool "xcsecurity" true) (lib.mesonOption "default_font_path" defaultFontPath) (lib.mesonOption "xkb_bin_dir" "${xkbcomp}/bin") @@ -116,11 +137,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "An X server for interfacing X11 apps with the Wayland protocol"; + description = "X server for interfacing X11 apps with the Wayland protocol"; homepage = "https://wayland.freedesktop.org/xserver.html"; license = licenses.mit; mainProgram = "Xwayland"; - maintainers = with maintainers; [ emantor ]; + maintainers = with maintainers; [ emantor k900 ]; platforms = platforms.linux; }; } |