public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update MDBTools Git version

Browse Source
This commit is contained in:
Michael Raskin 2014-04-12 19:27:26 +04:00
parent 0ef3c47778
commit 97982c4085
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/misc/mdbtools/git.nix
View File

@ -1,22 +1,25 @@
{ stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig, { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig,
libiconv, autoconf, automake, libtool }: libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils,
scrollkeeper}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "mdbtools-git"; name = "mdbtools-git";
src = fetchgit { src = fetchgit {
url = "http://github.com/brianb/mdbtools.git"; url = "http://github.com/brianb/mdbtools.git";
rev = "5ac44b69d9375cca3e1055b70fd22abf7fbf17ab"; rev = "dfd752ec022097ee1e0999173aa604d8a0c0ca8b";
sha256 = "094e6b480c6fda3a000d0d8539b209d2d7c204a440660a21c11f2e1c9b3aa345"; sha256 = "0ibj36yxlhwjgi7cj170lwpbzdbgidkq5p8raa59v76bdrxwmb0n";
}; };
buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake
libtool]; libtool which txt2man gnome_doc_utils scrollkeeper ];
preConfigure = '' preConfigure = ''
sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
export NIX_LDFLAGS="$NIX_LDFLAGS -liconv" sed -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(HAVE_GNOME_DOC_UTILS, test x$enable_gtk_doc = xyes)' \
./autogen.sh -e '/ENABLE_GTK_DOC/aAM_CONDITIONAL(ENABLE_SK, test x$enable_scrollkeeper = xyes)' \
-i configure.ac
autoreconf -i -f
''; '';
meta = { meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -1394,7 +1394,9 @@ let
mdbtools = callPackage ../tools/misc/mdbtools { }; mdbtools = callPackage ../tools/misc/mdbtools { };
mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { }; mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix {
inherit (gnome) scrollkeeper;
};
megacli = callPackage ../tools/misc/megacli { }; megacli = callPackage ../tools/misc/megacli { };