From 4a05f40181d68d2ced4c327c33c3d083ada579b2 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Thu, 27 Mar 2025 19:19:55 +0100 Subject: [PATCH] xdg-utils: remove procmail support from xdg-screensaver this seems like a relatively 'heavy' dependency, with procmail being unmaintained and not reproducible, and through xdg-utils getting pulled into the graphical installation ISO. With xdg-utils itself also currently being unmaintained, perhaps we should just remove this complexity for now, as according to the comment xdg-screensaver gracefully falls back in this case anyway. --- pkgs/by-name/xd/xdg-utils/package.nix | 34 ++++++++++----------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/xd/xdg-utils/package.nix b/pkgs/by-name/xd/xdg-utils/package.nix index 1363d081c2d4..60ab18c0e4a7 100644 --- a/pkgs/by-name/xd/xdg-utils/package.nix +++ b/pkgs/by-name/xd/xdg-utils/package.nix @@ -23,7 +23,6 @@ gnused, jq, nettools, - procmail, procps, which, xdg-user-dirs, @@ -206,28 +205,21 @@ let { scripts = [ "bin/xdg-screensaver" ]; interpreter = "${bash}/bin/bash"; - inputs = - commonDeps - ++ [ - nettools - perl - procps - ] - # procmail's funky build system is currently broken in cross-build. - # xdg-screensaver will gracefully degrade if it's not available. - ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) procmail; + inputs = commonDeps ++ [ + nettools + perl + procps + ]; # These are desktop-specific, so we don't want xdg-utils to be able to # call them when in a different setup. - fake.external = - commonFakes - ++ [ - "dcop" # KDE3 - "mate-screensaver-command" # MATE - "xautolock" # Xautolock - "xscreensaver-command" # Xscreensaver - "xset" # generic-ish X - ] - ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "lockfile"; # procmail + fake.external = commonFakes ++ [ + "dcop" # KDE3 + "lockfile" + "mate-screensaver-command" # MATE + "xautolock" # Xautolock + "xscreensaver-command" # Xscreensaver + "xset" # generic-ish X + ]; keep = { "$MV" = true; "$XPROP" = true;