Merge pull request #53902 from dtzWill/update/cpupower-fix-for-kernel-5

cpupower: fix w/linux 5, rework a bit
This commit is contained in:
Jörg Thalheim 2019-01-16 20:40:08 +00:00 committed by GitHub
commit bd3957ddc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,9 +1,8 @@
{ stdenv, buildPackages, kernel, pciutils, gettext }: { stdenv, buildPackages, kernel, pciutils, gettext }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cpupower-${kernel.version}"; pname = "cpupower";
inherit (kernel) version src;
src = kernel.src;
nativeBuildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
buildInputs = [ pciutils ]; buildInputs = [ pciutils ];
@ -17,16 +16,18 @@ stdenv.mkDerivation {
makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ];
installFlags = [ installFlags = stdenv.lib.mapAttrsToList
"bindir=$(out)/bin" (n: v: "${n}dir=${placeholder "out"}/${v}") {
"sbindir=$(out)/sbin" bin = "bin";
"mandir=$(out)/share/man" sbin = "sbin";
"includedir=$(out)/include" man = "share/man";
"libdir=$(out)/lib" include = "include";
"localedir=$(out)/share/locale" lib = "lib";
"docdir=$(out)/share/doc/cpupower" locale = "share/locale";
"confdir=$(out)/etc" doc = "share/doc/cpupower";
]; conf = "etc";
bash_completion_ = "share/bash-completion/completions";
};
enableParallelBuilding = true; enableParallelBuilding = true;