diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-10-02 11:10:49 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2022-10-02 15:38:47 +0100 |
commit | f7262e00543be771654cfbb6525f10bc5f3e1c4d (patch) | |
tree | 1ba0aa2fc92769a6c47cb627b8cade6cb1912a2c /pkgs/top-level | |
parent | 7af50793539a1864b8b0c4ee40b16ec87b9def6a (diff) | |
download | nixlib-f7262e00543be771654cfbb6525f10bc5f3e1c4d.tar nixlib-f7262e00543be771654cfbb6525f10bc5f3e1c4d.tar.gz nixlib-f7262e00543be771654cfbb6525f10bc5f3e1c4d.tar.bz2 nixlib-f7262e00543be771654cfbb6525f10bc5f3e1c4d.tar.lz nixlib-f7262e00543be771654cfbb6525f10bc5f3e1c4d.tar.xz nixlib-f7262e00543be771654cfbb6525f10bc5f3e1c4d.tar.zst nixlib-f7262e00543be771654cfbb6525f10bc5f3e1c4d.zip |
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.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 1 insertions, 1 deletions
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 { }; |