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

xorg.xorgserver: fixup build on *-darwin
2023-03-06 19:51:09 +00:00
parent cec1a51046 fcc9c904ca
commit 8127b7ce48
1 changed files with 2 additions and 2 deletions
@@ -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
        ];