From 69ed93c6a7a42aae556105dc7d88bcd08c711afe Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 29 Aug 2025 12:36:11 +0200 Subject: [PATCH] util-linux: fix build with systemd disabled Fixes: 025e6374343d ("util-linux: split lastlog into dedicated output") --- pkgs/by-name/ut/util-linux/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix index b772a9e4abb8..eb0da7a33da8 100644 --- a/pkgs/by-name/ut/util-linux/package.nix +++ b/pkgs/by-name/ut/util-linux/package.nix @@ -188,12 +188,13 @@ stdenv.mkDerivation (finalPackage: rec { ${lib.optionalString (!stdenv.hostPlatform.isStatic) ''moveToOutput "lib/security" "$lastlog"''} moveToOutput "lib/tmpfiles.d/lastlog2-tmpfiles.conf" "$lastlog" + moveToOutput "bin/lastlog2" "$lastlog" + ln -svf "$lastlog/bin/"* $bin/bin/ + '' + + lib.optionalString (withLastlog && systemdSupport) '' moveToOutput "lib/systemd/system/lastlog2-import.service" "$lastlog" substituteInPlace $lastlog/lib/systemd/system/lastlog2-import.service \ --replace-fail "$bin/bin/lastlog2" "$lastlog/bin/lastlog2" - - moveToOutput "bin/lastlog2" "$lastlog" - ln -svf "$lastlog/bin/"* $bin/bin/ '' + lib.optionalString stdenv.hostPlatform.isLinux ''