* Clean up the "dict" package. For some reason "configureFlags"

didn't get passed properly.

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

pkgs/servers/dict/1.9.15.nix

@@ -1,22 +0,0 @@
-args : with args; with builderDefs;
-        let localDefs = builderDefs.passthru.function ((rec {
-                src = /* put a fetchurl here */
-                fetchurl {
-                        url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz;
-                        sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac";
-                };
-
-                buildInputs = [flex bison which];
-                configureFlags = [ " --datadir=/var/run/current-system/share/dictd " ];
-        }) // args);
-        in with localDefs;
-stdenv.mkDerivation rec {
-        name = "dict-1.9.15";
-        builder = writeScript (name + "-builder")
-                (textClosure localDefs 
-                        [doConfigure doMakeInstall doForceShare doPropagate]);
-        meta = {
-                description = "Dict protocol server and client";
-                inherit src;
-        };
-}

pkgs/servers/dict/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, which, bison, flex }:
+
+stdenv.mkDerivation {
+  name = "dictd-1.9.15";
+
+  src = fetchurl {
+    url = mirror://sourceforge/dict/dictd-1.9.15.tar.gz;
+    sha256 = "0p41yf72l0igmshz6vxy3hm51z25600vrnb9j2jpgws4c03fqnac";
+  };
+
+  buildInputs = [ flex bison which ];
+  
+  configureFlags = "--datadir=/var/run/current-system/share/dictd";
+
+  meta = {
+    description = "Dict protocol server and client";
+  };
+}

pkgs/servers/dict/freedict.nix

@@ -1,4 +0,0 @@
-	fetchurl {
-		url = http://downloads.sourceforge.net/freedict/freedict-tools-0.2.tar.bz2;
-		sha256 = "0hai4rvyrsgagvwq8ahp8iwby77wr62whkkda2pkp8l6fp9sm2gd";
-	};

pkgs/top-level/all-packages.nix

@@ -5439,9 +5439,8 @@ let
     inherit fetchurl stdenv libtool gettext zlib readline guile python;
   };
 
-  dict = composedArgsAndFun (import ../servers/dict/1.9.15.nix) {
+  dict = makeOverridable (import ../servers/dict) {
-    inherit builderDefs which bison;
+    inherit fetchurl stdenv which bison flex;
-    flex=flex2534;
   };
 
   dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {