nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-21 20:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg: remove xlibsWrapper attribute, use top-level one instead

Browse Source 
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.
This commit is contained in:
Sergei Trofimovich 2022-10-02 11:10:49 +01:00
parent 7af5079353
commit f7262e0054
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -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 { };