From d64e34d5c4c8e0fc342ed7b5c1fbd46ae61e688a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 27 Dec 2022 09:20:42 +0000 Subject: [PATCH] xlibsWrapper: remove deprecated and now unused wrapper package There should be no reason to use this package as it's a remnant of non-modular X. Chances are you do not want every single library it used to pull in: freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt xorg.libXft xorg.libXext xorg.libSM xorg.libICE Just pick the ones you really need instead. `nixpkgs` does not have any users of `xlibsWrapper`. Closes: https://github.com/NixOS/nixpkgs/issues/194054 --- .../manual/release-notes/rl-2305.section.md | 2 ++ .../libraries/xlibs-wrapper/default.nix | 21 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 8 ------- 4 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/xlibs-wrapper/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 46c0f7ab6e076a7..65ac6557883311f 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -59,6 +59,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `nix.readOnlyStore` option has been renamed to `boot.readOnlyNixStore` to clarify that it configures the NixOS boot process, not the Nix daemon. +- Deprecated `xlibsWrapper` transitional package has been removed in favour of direct use of it's constitutents: `xorg.libX11`, `freetype` and others. + ## Other Notable Changes {#sec-release-23.05-notable-changes} diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix deleted file mode 100644 index 5340306de79a1bb..000000000000000 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{lib, stdenv, packages}: - -stdenv.mkDerivation { - name = "xlibs-wrapper"; - - dontBuild = true; - - installPhase = "mkdir -p $out"; - unpackPhase = "sourceRoot=."; - - propagatedBuildInputs = packages; - - preferLocalBuild = true; - - # For compatability with XFree86. - passthru.buildClientLibs = true; - - meta = { - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 63e2305462675f0..8c94a8f5a9550a3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1626,6 +1626,7 @@ mapAliases ({ xfceUnstable = xfce4-14; # Added 2019-09-17 xineLib = xine-lib; # Added 2021-04-27 xineUI = xine-ui; # Added 2021-04-27 + xlibsWrapper = throw "'xlibsWrapper' has been replaced by it's constituents"; # Converted to throw 2022-12-27 xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ded65307e18931d..50493d1322c2b98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23419,14 +23419,6 @@ with pkgs; xgeometry-select = callPackage ../tools/X11/xgeometry-select { }; - # Avoid using this. It isn't really a wrapper anymore, but we keep the name. - xlibsWrapper = callPackage ../development/libraries/xlibs-wrapper { - packages = [ - freetype fontconfig xorg.xorgproto xorg.libX11 xorg.libXt - xorg.libXft xorg.libXext xorg.libSM xorg.libICE - ]; - }; - xmlada = callPackage ../development/libraries/ada/xmlada { }; xmlrpc_c = callPackage ../development/libraries/xmlrpc-c { };