From e1a96b2b88fae1d9f9eadcfb11950701be1fb430 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Dec 2011 16:24:40 +0000
Subject: [PATCH] * Add cpufrequtils to the channel.

svn path=/nixpkgs/trunk/; revision=31017
---
 pkgs/os-specific/linux/cpufrequtils/default.nix | 9 +++++++--
 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 { };