diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 018b44a663dd..02dfb7ee1f55 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/infra/libkookie/nixpkgs/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,22 +73,13 @@ 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" ]; }); libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; - patches = [ - # Fixes an issue that happens when cross-compiling for us. - (fetchpatch { - url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac"; - sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza"; - }) - ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -325,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 ''; }); @@ -338,10 +330,6 @@ self: super: buildInputs = attrs.buildInputs ++ [ freetype fontconfig ]; }); - xcbproto = super.xcbproto.override { - python = python3; - }; - xcbutil = super.xcbutil.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; }); @@ -469,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 @@ -786,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" ]; |