From f7262e00543be771654cfbb6525f10bc5f3e1c4d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 2 Oct 2022 11:10:49 +0100
Subject: [PATCH] xorg: remove xlibsWrapper attribute, use top-level one
 instead

I noticed this attribute when tried to override `xorg` scope via
overlay:

    final: prev {
      xorg = prev.xorg.overrideScope' (f: p: {
        libXfont2 = p.libXfont2.overrideAttrs (oa: {
          patches = (oa.patches or []) ++ [
            ../libXfont2/nofollow.patch
          ];
        });
      }) // { inherit (prev) xlibsWrapper; };
    }

As a result I got unexpected `pulseaudio` build failures:

    $ nix build --no-link -f. pulseaudio
    error: attribute 'xlibsWrapper' missing

           at pkgs/servers/pulseaudio/default.nix:79:37:

               78|       ++ lib.optional jackaudioSupport libjack2
               79|       ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ]
                 |                                     ^
               80|       ++ lib.optional useSystemd systemd

Previous changes in this branch remove references to xorg.xlibsWrapper
in favour of xlibsWrapper. Let's remove injection of this attribute into
`xorg.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fff8023f2a27..cc745cd27c4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24111,7 +24111,7 @@ with pkgs;
     libdrm = if stdenv.isLinux then libdrm else null;
     abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
       or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
-  }) // { inherit xlibsWrapper; } );
+  }));
 
   xorg-autoconf = callPackage ../development/tools/misc/xorg-autoconf { };