From ba4d87485cde3cdb37c55009c600400c4034bb1f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 21 Jan 2026 18:24:13 +0200
Subject: [PATCH 1/2] cpufrequtils: remove unapplied & unrequired patch

---
 pkgs/by-name/cp/cpufrequtils/package.nix      |  5 ----
 .../remove-pot-creation-date.patch            | 24 -------------------
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch

diff --git a/pkgs/by-name/cp/cpufrequtils/package.nix b/pkgs/by-name/cp/cpufrequtils/package.nix
index c739aa6a0ca8..c13f59f03f83 100644
--- a/pkgs/by-name/cp/cpufrequtils/package.nix
+++ b/pkgs/by-name/cp/cpufrequtils/package.nix
@@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-AFOgcYPQaUg70GJhS8YcuAgMV32mHN9+ExsGThoa8Yg=";
   };
 
-  patches = [
-    # I am not 100% sure that this is ok, but it breaks repeatable builds.
-    ./remove-pot-creation-date.patch
-  ];
-
   patchPhase = ''
     sed -e "s@= /usr/bin/@= @g" \
       -e "s@/usr/@$out/@" \
diff --git a/pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch b/pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch
deleted file mode 100644
index 0116ed9eab0c..000000000000
--- a/pkgs/by-name/cp/cpufrequtils/remove-pot-creation-date.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u cpufrequtils-008/Makefile cpufrequtils-008.new/Makefile
---- cpufrequtils-008/Makefile	2012-05-06 01:17:18.000000000 +0200
-+++ cpufrequtils-008.new/Makefile	2013-08-16 20:52:29.961086536 +0200
-@@ -205,7 +205,8 @@
- 	@xgettext --default-domain=$(PACKAGE) --add-comments \
- 		--keyword=_ --keyword=N_ $(UTIL_SRC) && \
- 	test -f $(PACKAGE).po && \
--	mv -f $(PACKAGE).po po/$(PACKAGE).pot
-+	mv -f $(PACKAGE).po po/$(PACKAGE).pot && \
-+        sed -i -e'/POT-Creation/d' po/*.pot
- 
- update-gmo: po/$(PACKAGE).pot
- 	 @for HLANG in $(LANGUAGES); do \
-@@ -217,6 +218,7 @@
- 			echo "msgmerge for $$HLANG failed!"; \
- 			rm -f po/$$HLANG.new.po; \
- 		fi; \
-+		sed -i -e'/POT-Creation/d' po/*.po; \
- 		msgfmt --statistics -o po/$$HLANG.gmo po/$$HLANG.po; \
- 	done;
- 
-Common subdirectories: cpufrequtils-008/man and cpufrequtils-008.new/man
-Common subdirectories: cpufrequtils-008/po and cpufrequtils-008.new/po
-Common subdirectories: cpufrequtils-008/utils and cpufrequtils-008.new/utils

From d74677b6dc69aa54d16aab27880bb324b5bca53f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 21 Jan 2026 18:24:39 +0200
Subject: [PATCH 2/2] cpufrequtils: perform minimal Makefile substitution & use
 makeFlags

Also, use multiple outputs
---
 pkgs/by-name/cp/cpufrequtils/package.nix | 25 ++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cp/cpufrequtils/package.nix b/pkgs/by-name/cp/cpufrequtils/package.nix
index c13f59f03f83..ae5ce804270c 100644
--- a/pkgs/by-name/cp/cpufrequtils/package.nix
+++ b/pkgs/by-name/cp/cpufrequtils/package.nix
@@ -15,18 +15,35 @@ stdenv.mkDerivation rec {
     hash = "sha256-AFOgcYPQaUg70GJhS8YcuAgMV32mHN9+ExsGThoa8Yg=";
   };
 
-  patchPhase = ''
-    sed -e "s@= /usr/bin/@= @g" \
-      -e "s@/usr/@$out/@" \
-      -i Makefile
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail /usr/bin/install install
   '';
 
+  makeFlags = [
+    "bindir=$(out)/bin"
+    "sbindir=$(out)/sbin"
+    "mandir=$(man)/man"
+    "includedir=$(dev)/include"
+    "libdir=$(lib)/lib"
+    "localedir=$(out)/share/locale"
+    "docdir=$(man)/share/doc/packages/cpufrequtils"
+    "confdir=$(out)/etc/"
+  ];
+
   buildInputs = [
     stdenv.cc.libc.linuxHeaders
     libtool
     gettext
   ];
 
+  outputs = [
+    "out"
+    "lib"
+    "dev"
+    "man"
+  ];
+
   meta = {
     description = "Tools to display or change the CPU governor settings";
     homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html";