From 41205c0e6c894e01be1958b323eb015f95076caf Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 30 Jul 2025 10:49:57 +0200
Subject: [PATCH] util-linux: apply patch unconditionally

This was applied conditionally on staging-next to avoid throwing away
Linux builds.  It should have been changed to unconditional on
staging after that was merged, but I guess I forgot.  We generally
avoid conditional patch application wherever possible as it makes it
far too easy to miss when a patch needs to be removed or updated.
---
 pkgs/by-name/ut/util-linux/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 36b12f19dda0..899c82c3e588 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -45,8 +45,6 @@ stdenv.mkDerivation (finalPackage: rec {
 
   patches = [
     ./rtcwake-search-PATH-for-shutdown.patch
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
     (fetchurl {
       name = "bits-only-build-when-cpu_set_t-is-available.patch";
       url = "https://lore.kernel.org/util-linux/20250501075806.88759-1-hi@alyssa.is/raw";
@@ -138,12 +136,10 @@ stdenv.mkDerivation (finalPackage: rec {
   ];
 
   nativeBuildInputs = [
-    pkg-config
-    installShellFiles
-  ]
-  ++ lib.optionals (!stdenv.hostPlatform.isLinux) [
     autoconf
     automake116x
+    installShellFiles
+    pkg-config
   ]
   ++ lib.optionals translateManpages [ po4a ]
   ++ lib.optionals (cryptsetupSupport == "dlopen") [ cryptsetup ];