Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

cpupower: fix w/linux 5, rework a bit

authored by

Jörg Thalheim and committed by
GitHub
bd3957dd 4ad3d2df

+14 -13
+14 -13
pkgs/os-specific/linux/cpupower/default.nix
··· 1 { stdenv, buildPackages, kernel, pciutils, gettext }: 2 3 stdenv.mkDerivation { 4 - name = "cpupower-${kernel.version}"; 5 - 6 - src = kernel.src; 7 8 nativeBuildInputs = [ gettext ]; 9 buildInputs = [ pciutils ]; ··· 17 18 makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; 19 20 - installFlags = [ 21 - "bindir=$(out)/bin" 22 - "sbindir=$(out)/sbin" 23 - "mandir=$(out)/share/man" 24 - "includedir=$(out)/include" 25 - "libdir=$(out)/lib" 26 - "localedir=$(out)/share/locale" 27 - "docdir=$(out)/share/doc/cpupower" 28 - "confdir=$(out)/etc" 29 - ]; 30 31 enableParallelBuilding = true; 32
··· 1 { stdenv, buildPackages, kernel, pciutils, gettext }: 2 3 stdenv.mkDerivation { 4 + pname = "cpupower"; 5 + inherit (kernel) version src; 6 7 nativeBuildInputs = [ gettext ]; 8 buildInputs = [ pciutils ]; ··· 16 17 makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; 18 19 + installFlags = stdenv.lib.mapAttrsToList 20 + (n: v: "${n}dir=${placeholder "out"}/${v}") { 21 + bin = "bin"; 22 + sbin = "sbin"; 23 + man = "share/man"; 24 + include = "include"; 25 + lib = "lib"; 26 + locale = "share/locale"; 27 + doc = "share/doc/cpupower"; 28 + conf = "etc"; 29 + bash_completion_ = "share/bash-completion/completions"; 30 + }; 31 32 enableParallelBuilding = true; 33