diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-06 04:11:23 +0200 |
| commit | 9548028a22f3fbc44a450d5ccedaa722479a23ec (patch) | |
| tree | 4e405124ab321c69cd9997348fc4fec54540c1a2 /pkgs/os-specific/linux/cpupower | |
| parent | c08e4b9102f1b1bd7cd23cc84c61292f1f45aa7e (diff) | |
| parent | da82aff2b05c684cc8239627b54a30002281e35b (diff) | |
| download | nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.gz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.bz2 nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.lz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.xz nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.tar.zst nixlib-9548028a22f3fbc44a450d5ccedaa722479a23ec.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts: pkgs/os-specific/linux/cpupower/default.nix
Diffstat (limited to 'pkgs/os-specific/linux/cpupower')
| -rw-r--r-- | pkgs/os-specific/linux/cpupower/default.nix | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index 7cde965d2153..d10b789f3e47 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ gettext ]; buildInputs = [ pciutils ]; - configurePhase = '' + postPatch = '' cd tools/power/cpupower sed -i 's,/bin/true,${buildPackages.coreutils}/bin/true,' Makefile sed -i 's,/bin/pwd,${buildPackages.coreutils}/bin/pwd,' Makefile @@ -17,18 +17,16 @@ stdenv.mkDerivation { makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; - 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; |