Skip to content

Commit 5c09cdc

Browse files
committedFeb 5, 2018
linuxPackages.cpupower: clean up
fixes the build on 17.09 (cherry picked from commit 3917279)
1 parent b6ad2ef commit 5c09cdc

File tree

1 file changed

+11
-17
lines changed

1 file changed

+11
-17
lines changed
 

‎pkgs/os-specific/linux/cpupower/default.nix

+11-17
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,23 @@ stdenv.mkDerivation {
77

88
buildInputs = [ coreutils pciutils gettext ];
99

10-
configurePhase = ''
10+
postPatch = ''
1111
cd tools/power/cpupower
1212
sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile
1313
sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile
1414
sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile
1515
'';
1616

17-
buildPhase = ''
18-
make
19-
'';
20-
21-
installPhase = ''
22-
make \
23-
bindir="$out/bin" \
24-
sbindir="$out/sbin" \
25-
mandir="$out/share/man" \
26-
includedir="$out/include" \
27-
libdir="$out/lib" \
28-
localedir="$out/share/locale" \
29-
docdir="$out/share/doc/cpupower" \
30-
confdir="$out/etc" \
31-
install install-man
32-
'';
17+
installFlags = [
18+
"bindir=$(out)/bin"
19+
"sbindir=$(out)/sbin"
20+
"mandir=$(out)/share/man"
21+
"includedir=$(out)/include"
22+
"libdir=$(out)/lib"
23+
"localedir=$(out)/share/locale"
24+
"docdir=$(out)/share/doc/cpupower"
25+
"confdir=$(out)/etc"
26+
];
3327

3428
enableParallelBuilding = true;
3529

0 commit comments

Comments
 (0)
Please sign in to comment.