From 39172792c6ef2717bf7a2b6788aa87fe0598229b Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 5 Feb 2018 12:51:42 +0100 Subject: linuxPackages.cpupower: clean up fixes the build on 17.09 --- pkgs/os-specific/linux/cpupower/default.nix | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'pkgs/os-specific/linux/cpupower') diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index d6d529627e2..ba2e9c8c52d 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -7,29 +7,23 @@ stdenv.mkDerivation { buildInputs = [ coreutils pciutils gettext ]; - configurePhase = '' + postPatch = '' cd tools/power/cpupower sed -i 's,/bin/true,${coreutils}/bin/true,' Makefile sed -i 's,/bin/pwd,${coreutils}/bin/pwd,' Makefile sed -i 's,/usr/bin/install,${coreutils}/bin/install,' Makefile ''; - buildPhase = '' - make - ''; - - installPhase = '' - make \ - 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" \ - install install-man - ''; + 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" + ]; enableParallelBuilding = true; -- cgit 1.4.1