From 6c61381f7b825a4b19931ef922c890b71fb81f00 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 22 Dec 2025 23:36:30 +0800 Subject: [PATCH] xfce.mkXfceDerivation: Deprecate All Xfce packages are meson-only in 4.22 and there really are no Xfce specific bits involved in packaging that worth keeping mkXfceDerivation. --- doc/release-notes/rl-2605.section.md | 5 +++++ pkgs/desktops/xfce/default.nix | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 300d50e91013..a9619a1f5bb7 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -9,6 +9,11 @@ +- `xfce.mkXfceDerivation` has been deprecated, please use `stdenv.mkDerivation` + directly. You can migrate by adding `pkg-config`, `xfce4-dev-tools`, and + `wrapGAppsHook3` to your `nativeBuildInputs` and `--enable-maintainer-mode` + to your `configureFlags`. + - `corepack_latest` has been removed, as Corepack is no longer distributed with Node.js. - `spoof` has been removed, as there are many issues upstream with it working on modern OS versions, and it appears to be unmaintained. diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index c74183e49995..bceed06aff11 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -19,8 +19,6 @@ makeScopeWithSplicing' { genericUpdater = pkgs.genericUpdater; - mkXfceDerivation = callPackage ./mkXfceDerivation.nix { }; - #### CORE exo = callPackage ./core/exo { }; @@ -169,6 +167,13 @@ makeScopeWithSplicing' { automakeAddFlags = throw "xfce.automakeAddFlags has been removed: this setup-hook is no longer used in Nixpkgs"; # added 2024-03-24 + mkXfceDerivation = lib.warnOnInstantiate '' + xfce.mkXfceDerivation has been deprecated, please use stdenv.mkDerivation + directly. You can migrate by adding `pkg-config`, `xfce4-dev-tools`, and + `wrapGAppsHook3` to your nativeBuildInputs and `--enable-maintainer-mode` + to your configureFlags. + '' (callPackage ./mkXfceDerivation.nix { }); # added 2025-12-22 + xinitrc = self.xfce4-session.xinitrc; # added 2019-11-04 thunar-bare = self.thunar-unwrapped; # added 2019-11-04