From a6635711da93e9e7681277a9bfddc0b467776543 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Oct 2022 11:08:49 +0100 Subject: [PATCH 1/6] gnome2.libgnomeui: use xlibsWrapper instead of xorg.xlibsWrapper --- pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index 0a84e0ea3ec5..f59bee32929b 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xlibsWrapper, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome-keyring, libglade }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool ]; buildInputs = - [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; + [ xlibsWrapper libxml2 GConf pango glib libgnome-keyring libglade libtool ]; propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ]; } From 0bed7c059fa6a36c391a7a8633a7dfd2ce348300 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Oct 2022 11:09:39 +0100 Subject: [PATCH 2/6] pulseaudio: use xlibsWrapper instead of xorg.xlibsWrapper --- pkgs/servers/pulseaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 5084bd720514..c54cba96d103 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config , libsndfile, libtool, makeWrapper, perlPackages -, xorg, libcap, alsa-lib, glib, dconf +, xlibsWrapper, xorg, libcap, alsa-lib, glib, dconf , avahi, libjack2, libasyncns, lirc, dbus , sbc, bluez5, udev, openssl, fftwFloat , soxr, speexdsp, systemd, webrtc-audio-processing @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals x11Support [ xorg.xlibsWrapper xorg.libXtst xorg.libXi ] + ++ lib.optionals x11Support [ xlibsWrapper xorg.libXtst xorg.libXi ] ++ lib.optional useSystemd systemd ++ lib.optionals stdenv.isLinux [ alsa-lib udev ] ++ lib.optional airtunesSupport openssl From b0c751b8003fb61b9408c3e38da0c8d69f845a1c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Oct 2022 11:10:23 +0100 Subject: [PATCH 3/6] ted: use xlibsWrapper instead of xorg.xlibsWrapper --- pkgs/tools/typesetting/ted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index bd21ad4c437b..cc9d2574ff88 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: +{ lib, stdenv, fetchurl, pkg-config, zlib, pcre, xlibsWrapper, xorg, libjpeg, libtiff, libpng, gtk2, libpaper, makeWrapper, ghostscript }: stdenv.mkDerivation rec { pname = "ted"; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ zlib pcre xorg.xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; + buildInputs = [ zlib pcre xlibsWrapper xorg.libXpm libjpeg libtiff libpng gtk2 libpaper ]; meta = with lib; { description = "An easy rich text processor"; From 132ef65058e0c30300c190ff4f19583dd580634f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Oct 2022 11:33:18 +0100 Subject: [PATCH 4/6] vlc: use xlibsWrapper instead of xorg.xlibsWrapper --- pkgs/applications/video/vlc/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e870b8572d8d..f3d3bf38b634 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -64,6 +64,7 @@ , systemd , taglib , unzip +, xlibsWrapper , xorg , zlib , chromecastSupport ? true, libmicrodns, protobuf @@ -149,6 +150,7 @@ stdenv.mkDerivation rec { srt systemd taglib + xlibsWrapper zlib ] ++ (with xorg; [ @@ -156,7 +158,6 @@ stdenv.mkDerivation rec { libXv libXvMC xcbutilkeysyms - xlibsWrapper ]) ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 From 7af50793539a1864b8b0c4ee40b16ec87b9def6a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Oct 2022 11:40:02 +0100 Subject: [PATCH 5/6] xine-ui: use xlibsWrapper instead of xorg.xlibsWrapper --- pkgs/applications/video/xine-ui/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b4f610c7a91d..d88172a592bd 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -12,6 +12,7 @@ , readline , shared-mime-info , xine-lib +, xlibsWrapper , xorg }: @@ -46,6 +47,7 @@ stdenv.mkDerivation rec { ncurses readline xine-lib + xlibsWrapper ] ++ (with xorg; [ libXext libXft @@ -54,7 +56,6 @@ stdenv.mkDerivation rec { libXtst libXv libXxf86vm - xlibsWrapper xorgproto ]); From f7262e00543be771654cfbb6525f10bc5f3e1c4d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 2 Oct 2022 11:10:49 +0100 Subject: [PATCH 6/6] 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 { };