diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index d251bee71d9..8a3842322f9 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,15 +1,20 @@ -{ stdenv, fetchurl, glib, readline, bison, flex, pkgconfig }: +{ stdenv, fetchFromGitHub, glib, readline +, bison, flex, pkgconfig, autoreconfHook +, txt2man, which }: -stdenv.mkDerivation { - name = "mdbtools-0.6pre1"; +let version = "0.7.1"; +in stdenv.mkDerivation { + name = "mdbtools-${version}"; - src = fetchurl { - url = mirror://sourceforge/mdbtools/mdbtools-0.6pre1.tar.gz; - sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi"; + src = fetchFromGitHub { + owner = "brianb"; + repo = "mdbtools"; + rev = version; + sha256 = "0gwcpp9y09xhs21g7my2fs8ncb8i6ahlyixcx8jd3q97jbzj441l"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [glib readline bison flex]; + nativeBuildInputs = [ pkgconfig bison flex autoreconfHook txt2man which ]; + buildInputs = [ glib readline ]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix deleted file mode 100644 index b275002e110..00000000000 --- a/pkgs/tools/misc/mdbtools/git.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoreconfHook, which, txt2man, gnome-doc-utils, scrollkeeper }: - -stdenv.mkDerivation { - name = "mdbtools-git-2014-07-25"; - - src = fetchgit { - url = "http://github.com/brianb/mdbtools.git"; - rev = "9ab40e83e6789015c965c92bdb62f92f8cdd0dbd"; - sha256 = "0hlf5lk86xm0bpdlpk4a1zyfvbim76dhvmybxga2p7mbb1jc825l"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - glib readline bison flex autoreconfHook which txt2man - gnome-doc-utils scrollkeeper libiconv - ]; - - preAutoreconf = '' - sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \ - -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)' \ - -i configure.ac - ''; - - preConfigure = '' - sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c - ''; - - meta = with stdenv.lib; { - description = ".mdb (MS Access) format tools"; - homepage = http://mdbtools.sourceforge.net; - platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl2 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fff431c58e2..872e86e677b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4112,10 +4112,6 @@ with pkgs; mdbtools = callPackage ../tools/misc/mdbtools { }; - mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { - inherit (gnome2) scrollkeeper; - }; - mdk = callPackage ../development/tools/mdk { }; mdp = callPackage ../applications/misc/mdp { };