* More cleanup.

svn path=/nixpkgs/trunk/; revision=22798

pkgs/tools/networking/tcng/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, bison, flex, db4, perl, kernel, iproute }:
 
 # tcc can even compile kernel modules for speed reason.
 # that would be a nice use case to test!
@@ -10,7 +10,7 @@ args: with args;
 
 let version = "10b"; in
 
-args.stdenv.mkDerivation {
+stdenv.mkDerivation {
 
   name = "tcng-${version}";
 
@@ -19,13 +19,14 @@ args.stdenv.mkDerivation {
     sha256 = "1xjs0yn90rfa8ibxybg3gab1xzcjg60njymq2bd1b0a9i0arx7ji";
   };
 
-  iproute2Src=iproute.src;
+  iproute2Src = iproute.src;
 
-  patches = [
-    (fetchurl {
-      url = mirror://debian/pool/main/t/tcng/tcng_10b-2.diff.gz;
-      sha256 = "17i4s2ffif0k4b78gfhkp08lvvharbfvyhwbd0vkwgpria0b9zrd";
-    })];
+  patches =
+    [ (fetchurl {
+        url = mirror://debian/pool/main/t/tcng/tcng_10b-2.diff.gz;
+        sha256 = "17i4s2ffif0k4b78gfhkp08lvvharbfvyhwbd0vkwgpria0b9zrd";
+      })
+    ];
   
   # one mailinglist post says you should just add your kernel version to the list.. (?)
   patchPhase = ''
@@ -38,7 +39,6 @@ args.stdenv.mkDerivation {
     find . -type f | xargs sed -i 's@/lib/cpp@cpp@g'
   '';
 
-
   # gentoo ebulid says tcsim doesn't compile with 2.6 headers..
   # DATADIR can still be overridden by env TOPDIR=...
   # Don't know whats it for except including the default .tc files
@@ -55,12 +55,11 @@ args.stdenv.mkDerivation {
     --with-tcsim
   '';
 
-
   # hacky, how to enable building tcc the correct way?
   # adding shared and tcc to SUBDIRS and run make again isn't nice but works
   buildPhase = ''
     sed -i 's@^\(SUBDIRS.*\)@\1 shared tcc@' Makefile 
-    make;
+    make
   '';
 
   # manually copy tcc and include files.. see comment above
@@ -71,16 +70,11 @@ args.stdenv.mkDerivation {
     cp tcc/*.tc $out/lib/tcng/include
   '';
 
-  buildInputs =(with args; [bison flex db4 perl]);
+  buildInputs = [ bison flex db4 perl ];
 
   meta = { 
-      description="tcng - Traffic Control Next Generation";
-      homepage = "http://tcng.sourceforge.net/";
-      license = "GPLv2";
-      longDescription = ''
-        useful links: http://linux-ip.net/articles/Traffic-Control-HOWTO,
-        http://blog.edseek.com/~jasonb/articles/traffic_shaping/
-        tcng language: http://linux-ip.net/gl/tcng/node9.html tcng language
-      '';
+    description = "tcng - Traffic Control Next Generation";
+    homepage = "http://tcng.sourceforge.net/";
+    license = "GPLv2";
   };
 }