diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-04-12 19:27:26 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-04-12 19:29:40 +0400 |
| commit | 97982c4085bcf2a73d5933a93d30589aea045a36 (patch) | |
| tree | 3e240e8addf153c37956f31b7e08d49dcec6e4e7 /pkgs | |
| parent | 0ef3c4777825d3afc1ea59e6ab83b02523bcb917 (diff) | |
| download | nixpkgs-97982c4085bcf2a73d5933a93d30589aea045a36.tar nixpkgs-97982c4085bcf2a73d5933a93d30589aea045a36.tar.gz nixpkgs-97982c4085bcf2a73d5933a93d30589aea045a36.tar.bz2 nixpkgs-97982c4085bcf2a73d5933a93d30589aea045a36.tar.lz nixpkgs-97982c4085bcf2a73d5933a93d30589aea045a36.tar.xz nixpkgs-97982c4085bcf2a73d5933a93d30589aea045a36.tar.zst nixpkgs-97982c4085bcf2a73d5933a93d30589aea045a36.zip | |
Update MDBTools Git version
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/mdbtools/git.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index e7342d9b3e6..2805514965e 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,22 +1,25 @@ { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconv, autoconf, automake, libtool }: + libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, + scrollkeeper}: stdenv.mkDerivation { name = "mdbtools-git"; src = fetchgit { url = "http://github.com/brianb/mdbtools.git"; - rev = "5ac44b69d9375cca3e1055b70fd22abf7fbf17ab"; - sha256 = "094e6b480c6fda3a000d0d8539b209d2d7c204a440660a21c11f2e1c9b3aa345"; + rev = "dfd752ec022097ee1e0999173aa604d8a0c0ca8b"; + sha256 = "0ibj36yxlhwjgi7cj170lwpbzdbgidkq5p8raa59v76bdrxwmb0n"; }; buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake - libtool]; + libtool which txt2man gnome_doc_utils scrollkeeper ]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c - export NIX_LDFLAGS="$NIX_LDFLAGS -liconv" - ./autogen.sh + 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 + autoreconf -i -f ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc4b1e14313..888f62d0f06 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1394,7 +1394,9 @@ let 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 { }; |