From f4a765d4b3fb22da060f28216efc1322b3c8db05 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 8 Jan 2019 12:22:19 -0600
Subject: [PATCH 1/2] cpupower: fix w/5.0-rc1 (completion dir), rework a bit

---
 pkgs/os-specific/linux/cpupower/default.nix | 27 +++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
index 2b8efe7e7449..fa6b07d4f92f 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -1,9 +1,8 @@
 { stdenv, buildPackages, kernel, pciutils, gettext }:
 
 stdenv.mkDerivation {
-  name = "cpupower-${kernel.version}";
-
-  src = kernel.src;
+  pname = "cpupower";
+  inherit (kernel) version src;
 
   nativeBuildInputs = [ gettext ];
   buildInputs = [ pciutils ];
@@ -17,16 +16,18 @@ stdenv.mkDerivation {
 
   makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ];
 
-  installFlags = [
-    "bindir=$(out)/bin"
-    "sbindir=$(out)/sbin"
-    "mandir=$(out)/share/man"
-    "includedir=$(out)/include"
-    "libdir=$(out)/lib"
-    "localedir=$(out)/share/locale"
-    "docdir=$(out)/share/doc/cpupower"
-    "confdir=$(out)/etc"
-  ];
+  installFlags = stdenv.lib.mapAttrsToList
+    (n: v: "${n}=${placeholder "out"}/${v}") {
+    bindir = "bin";
+    sbindir = "sbin";
+    mandir = "share/man";
+    includedir = "include";
+    libdir = "lib";
+    localedir = "share/locale";
+    docdir = "share/doc/cpupower";
+    confdir = "etc";
+    bash_completion_dir = "share/bash-completion/completions";
+  };
 
   enableParallelBuilding = true;
 

From 24777fd502c8b6c62d0db3fa0c50b72eaa7f05d1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 8 Jan 2019 12:23:50 -0600
Subject: [PATCH 2/2] cpupower: push 'dir' suffix into generation func

bit silly for the odd-man-out "bash_completion_dir"
but IMO easier to read.
---
 pkgs/os-specific/linux/cpupower/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix
index fa6b07d4f92f..1b307da8cb80 100644
--- a/pkgs/os-specific/linux/cpupower/default.nix
+++ b/pkgs/os-specific/linux/cpupower/default.nix
@@ -17,16 +17,16 @@ stdenv.mkDerivation {
   makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ];
 
   installFlags = stdenv.lib.mapAttrsToList
-    (n: v: "${n}=${placeholder "out"}/${v}") {
-    bindir = "bin";
-    sbindir = "sbin";
-    mandir = "share/man";
-    includedir = "include";
-    libdir = "lib";
-    localedir = "share/locale";
-    docdir = "share/doc/cpupower";
-    confdir = "etc";
-    bash_completion_dir = "share/bash-completion/completions";
+    (n: v: "${n}dir=${placeholder "out"}/${v}") {
+    bin = "bin";
+    sbin = "sbin";
+    man = "share/man";
+    include = "include";
+    lib = "lib";
+    locale = "share/locale";
+    doc = "share/doc/cpupower";
+    conf = "etc";
+    bash_completion_ = "share/bash-completion/completions";
   };
 
   enableParallelBuilding = true;