diff options
author | gfrascadorio <gfrascadorio@sharklasers.com> | 2021-07-08 09:04:20 -0600 |
---|---|---|
committer | gfrascadorio <gfrascadorio@sharklasers.com> | 2021-07-13 10:44:23 -0600 |
commit | 95172d9ebefc6b4bce3fd4a54e098027dad44ea6 (patch) | |
tree | 0bc0cdfbf0d818bd862d4fd184e352ce33124925 /pkgs/tools/misc/idutils | |
parent | 4036bb94c78329292ef44c233bb42da40b8bd4d2 (diff) |
idutils: fix by using latest gnulib
Diffstat (limited to 'pkgs/tools/misc/idutils')
-rw-r--r-- | pkgs/tools/misc/idutils/default.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index ac64fe9e8bc4b..e43ab2ae8797a 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -1,27 +1,29 @@ -{ fetchurl, lib, stdenv, emacs }: +{ fetchurl, lib, stdenv, emacs, gnulib, autoconf, bison, automake, gettext, gperf, texinfo, perl, rsync, gawk}: stdenv.mkDerivation rec { - name = "idutils-4.6"; + pname = "idutils"; + version = "4.6"; src = fetchurl { - url = "mirror://gnu/idutils/${name}.tar.xz"; + url = "mirror://gnu/idutils/idutils-${version}.tar.xz"; sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"; }; - preConfigure = - '' - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in idutils is updated. - sed -i '/gets is a security hole/d' lib/stdio.in.h + preConfigure = '' + # replace embedded gnulib tests with those from gnulib package + bash -O extglob -c "cd gnulib-tests; rm -r !(Makefile.am)" + substituteInPlace ./configure.ac --replace "AC_PREREQ(2.61)" "AC_PREREQ(2.64)" + ./bootstrap --force --gnulib-srcdir=${gnulib} --skip-po --bootstrap-sync --no-git ''; buildInputs = lib.optional stdenv.isLinux emacs; + nativeBuildInputs = [ gnulib autoconf bison automake gettext gperf texinfo perl rsync gawk ]; doCheck = !stdenv.isDarwin; patches = [ ./nix-mapping.patch ]; - meta = { + meta = with lib; { description = "Text searching utility"; longDescription = '' @@ -46,10 +48,9 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gnu.org/software/idutils/"; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with maintainers; [ gfrascadorio ]; platforms = lib.platforms.all; - broken = true; }; } |