ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 03:56:17 +03:00
Code Issues Projects Releases Wiki Activity

xorg.xorgserver: apply upstream patch

Browse Source 
This fixes xorg.xf86videovmware build (channel blocker).
This commit is contained in:
Vladimír Čunát 2021-11-24 09:10:11 +01:00
parent 40c3bc3b08
commit 0649fcdf26
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/x11/xorg/overrides.nix
View File

@ -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 # 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 ./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 ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [