diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-17 09:21:29 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-01-17 09:21:29 +0100 |
| commit | 9cfae76fc5f0a3a51e91d617887d8fe34317885d (patch) | |
| tree | b6b8e12845e55665d67ca4197fa7078d43ee3a4e /pkgs/os-specific | |
| parent | cabe7d650613f1617988eb7750b8eca336181b81 (diff) | |
| parent | 379c3899a59df74a2359b34f80604416a25bae05 (diff) | |
| download | nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.gz nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.bz2 nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.lz nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.xz nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.tar.zst nixlib-9cfae76fc5f0a3a51e91d617887d8fe34317885d.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/cpupower/default.nix | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index 2b8efe7e7449..1b307da8cb80 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -1,9 +1,8 @@ { stdenv, buildPackages, kernel, pciutils, gettext }: stdenv.mkDerivation { - name = "cpupower-${kernel.version}"; - - src = kernel.src; + pname = "cpupower"; + inherit (kernel) version src; nativeBuildInputs = [ gettext ]; buildInputs = [ pciutils ]; @@ -17,16 +16,18 @@ stdenv.mkDerivation { makeFlags = [ "CROSS=${stdenv.cc.targetPrefix}" ]; - 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" - ]; + installFlags = stdenv.lib.mapAttrsToList + (n: v: "${n}dir=${placeholder "out"}/${v}") { + bin = "bin"; + sbin = "sbin"; + man = "share/man"; + include = "include"; + lib = "lib"; + locale = "share/locale"; + doc = "share/doc/cpupower"; + conf = "etc"; + bash_completion_ = "share/bash-completion/completions"; + }; enableParallelBuilding = true; |