dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #219852 from vcunat/p/xorgserver-darwin

Browse Source 
xorg.xorgserver: fixup build on *-darwin
This commit is contained in:
Martin Weinelt 2023-03-06 19:51:09 +00:00 committed by GitHub
commit 8127b7ce48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -755,7 +755,7 @@ self: super:
in attrs //
(let
version = lib.getVersion attrs;
commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
commonBuildInputs = attrs.buildInputs ++ [ xtrans libxcvt ];
commonPropagatedBuildInputs = [
dbus libGL libGLU libXext libXfont libXfont2 libepoxy libunwind
libxshmfence pixman xorgproto zlib
@ -791,7 +791,7 @@ 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
];
buildInputs = commonBuildInputs ++ [ libdrm libxcvt mesa ];
buildInputs = commonBuildInputs ++ [ libdrm mesa ];
propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
udev
];