diff options
Diffstat (limited to 'pkgs/servers/x11/xorg/overrides.nix')
-rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index e6047458cf27..02dfb7ee1f55 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -4,7 +4,7 @@ freetype, tradcpp, fontconfig, meson, ninja, ed, fontforge, libGL, spice-protocol, zlib, libGLU, dbus, libunwind, libdrm, mesa, udev, bootstrap_cmds, bison, flex, clangStdenv, autoreconfHook, - mcpp, epoxy, openssl, pkgconfig, llvm_6, python3, libxslt, + mcpp, epoxy, openssl, pkgconfig, llvm_6, libxslt, ApplicationServices, Carbon, Cocoa, Xplugin }: @@ -73,9 +73,7 @@ self: super: mkfontdir = self.mkfontscale; - libxcb = (super.libxcb.override { - python = python3; - }).overrideAttrs (attrs: { + libxcb = super.libxcb.overrideAttrs (attrs: { configureFlags = [ "--enable-xkb" "--enable-xinput" ]; outputs = [ "out" "dev" "man" "doc" ]; }); @@ -318,8 +316,9 @@ self: super: setxkbmap = super.setxkbmap.overrideAttrs (attrs: { postInstall = '' - mkdir -p $out/share + mkdir -p $out/share/man/man7 ln -sfn ${self.xkeyboardconfig}/etc/X11 $out/share/X11 + ln -sfn ${self.xkeyboardconfig}/share/man/man7/xkeyboard-config.7.gz $out/share/man/man7 ''; }); @@ -331,10 +330,6 @@ self: super: buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; }); - xcbproto = super.xcbproto.override { - python = python3; - }; - xcbutil = super.xcbutil.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; }); @@ -462,8 +457,8 @@ self: super: }); xkeyboardconfig = super.xkeyboardconfig.overrideAttrs (attrs: { + prePatch = "patchShebangs rules/merge.py"; nativeBuildInputs = attrs.nativeBuildInputs ++ [ intltool libxslt ]; - configureFlags = [ "--with-xkb-rules-symlink=xorg" ]; # 1: compatibility for X11/xkb location @@ -635,16 +630,6 @@ self: super: propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; - # patchPhase is not working, this is a hack but we can remove it in the next xorg-server release - preConfigure = let - # https://gitlab.freedesktop.org/xorg/xserver/-/issues/1067 - headerFix = fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/919f1f46fc67dae93b2b3f278fcbfc77af34ec58.patch"; - sha256 = "0w48rdpl01v0c97n9zdxhf929y76r1f6rqkfs9mfygkz3xcmrfsq"; - }; - in '' - patch -p1 < ${headerFix} - ''; prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; @@ -789,7 +774,7 @@ self: super: rev = "f66d39544bb8339130c96d282a80f87ca1606caf"; sha256 = "14rwbbn06l8qpx7s5crxghn80vgcx8jmfc7qvivh72d81r0kvywl"; }; - buildInputs = attrs.buildInputs ++ [self.libXfixes self.libXScrnSaver self.pixman]; + buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ]; nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; |