diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-11-24 09:10:11 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-11-24 09:10:11 +0100 |
| commit | 0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2 (patch) | |
| tree | 171ea8bb9661d40557f94c9d840ebe7e8e174742 /pkgs/servers/x11 | |
| parent | 40c3bc3b0876f82b7ebf6816ab32a3c0c6e91133 (diff) | |
| download | nixpkgs-0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2.tar nixpkgs-0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2.tar.gz nixpkgs-0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2.tar.bz2 nixpkgs-0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2.tar.lz nixpkgs-0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2.tar.xz nixpkgs-0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2.tar.zst nixpkgs-0649fcdf26b0b6b5a7029fa2f2553fe9a24882a2.zip | |
xorg.xorgserver: apply upstream patch
This fixes xorg.xf86videovmware build (channel blocker).
Diffstat (limited to 'pkgs/servers/x11')
| -rw-r--r-- | pkgs/servers/x11/xorg/overrides.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 87a42c4b852..24db9d72039 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -648,6 +648,14 @@ self: super: # # We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail ./dont-create-logdir-during-build.patch + + # Fix e.g. xorg.xf86videovmware with libdrm 2.4.108 + # TODO: remove with xorgserver >= 1.21 + (fetchpatch { + name = "stdbool.patch"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/454b3a826edb5fc6d0fea3a9cfd1a5e8fc568747.diff"; + sha256 = "1l9qg905jvlw3r0kx4xfw5m12pbs0782v2g3267d1m6q4m6fj1zy"; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ |