diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-21 16:24:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-12-21 16:24:40 +0000 |
| commit | e1a96b2b88fae1d9f9eadcfb11950701be1fb430 (patch) | |
| tree | 8d708c18ec788220f9ca1f86e03c7a8910f3800a /pkgs | |
| parent | b2bdf7aa9f193b0a9e9dba5d4d86b9586a234832 (diff) | |
| download | nixpkgs-e1a96b2b88fae1d9f9eadcfb11950701be1fb430.tar nixpkgs-e1a96b2b88fae1d9f9eadcfb11950701be1fb430.tar.gz nixpkgs-e1a96b2b88fae1d9f9eadcfb11950701be1fb430.tar.bz2 nixpkgs-e1a96b2b88fae1d9f9eadcfb11950701be1fb430.tar.lz nixpkgs-e1a96b2b88fae1d9f9eadcfb11950701be1fb430.tar.xz nixpkgs-e1a96b2b88fae1d9f9eadcfb11950701be1fb430.tar.zst nixpkgs-e1a96b2b88fae1d9f9eadcfb11950701be1fb430.zip | |
* Add cpufrequtils to the channel.
svn path=/nixpkgs/trunk/; revision=31017
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/cpufrequtils/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 74db3a0d890..35bf57c269e 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, linuxHeaders, glibc, libtool, gettext}: +{ stdenv, fetchurl, libtool, gettext }: assert stdenv.isLinux && stdenv.system != "powerpc-linux"; @@ -16,5 +16,10 @@ stdenv.mkDerivation { -i Makefile ''; - buildInputs = [ linuxHeaders glibc libtool gettext ]; + buildInputs = [ stdenv.gcc.libc.kernelHeaders libtool gettext ]; + + meta = { + description = "Tools to display or change the CPU governor settings"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d09cc607ac..49b5c8fffaa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5171,12 +5171,7 @@ let conky = callPackage ../os-specific/linux/conky { }; - cpufrequtils = ( - import ../os-specific/linux/cpufrequtils { - inherit fetchurl stdenv libtool gettext; - glibc = stdenv.gcc.libc; - linuxHeaders = stdenv.gcc.libc.kernelHeaders; - }); + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; |