diff options
| author | Will Dietz <w@wdtz.org> | 2019-01-08 12:22:19 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-01-13 17:12:19 -0600 |
| commit | f4a765d4b3fb22da060f28216efc1322b3c8db05 (patch) | |
| tree | 8fe40996a50f7c295cbd358a7d59ee04806711df | |
| parent | 5285526b0fd58474de11b32eaa5e836dd2369189 (diff) | |
| download | nixpkgs-f4a765d4b3fb22da060f28216efc1322b3c8db05.tar nixpkgs-f4a765d4b3fb22da060f28216efc1322b3c8db05.tar.gz nixpkgs-f4a765d4b3fb22da060f28216efc1322b3c8db05.tar.bz2 nixpkgs-f4a765d4b3fb22da060f28216efc1322b3c8db05.tar.lz nixpkgs-f4a765d4b3fb22da060f28216efc1322b3c8db05.tar.xz nixpkgs-f4a765d4b3fb22da060f28216efc1322b3c8db05.tar.zst nixpkgs-f4a765d4b3fb22da060f28216efc1322b3c8db05.zip | |
cpupower: fix w/5.0-rc1 (completion dir), rework a bit
| -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 2b8efe7e744..fa6b07d4f92 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}=${placeholder "out"}/${v}") { + bindir = "bin"; + sbindir = "sbin"; + mandir = "share/man"; + includedir = "include"; + libdir = "lib"; + localedir = "share/locale"; + docdir = "share/doc/cpupower"; + confdir = "etc"; + bash_completion_dir = "share/bash-completion/completions"; + }; enableParallelBuilding = true; |