* Removed selectVersion. There's no good reason to write

  `selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

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

1 files changed, 7 insertions, 9 deletions

diff --git a/pkgs/tools/misc/mdbtools/0.6-pre1.nix b/pkgs/tools/misc/mdbtools/default.nix
index 9478ef1286b..9b1968c6fd1 100644
--- a/pkgs/tools/misc/mdbtools/0.6-pre1.nix
+++ b/pkgs/tools/misc/mdbtools/default.nix
@@ -1,21 +1,19 @@
-args : with args; 
-rec {
+{ stdenv, fetchurl, glib, readline, bison, flex, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "mdbtools-0.6pre1";
+
   src = fetchurl {
     url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz;
     sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
   };
 
   buildInputs = [glib readline bison flex pkgconfig];
-  configureFlags = [];
 
-  preConfigure = fullDepEntry (''
+  preConfigure = ''
     sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
-  '') ["doUnpack" "minInit"];
+  '';
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-      
-  name = "mdbtools-" + version;
   meta = {
     description = ".mdb (MS Access) format tools";
   };