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

gnugrep: Update to 2.14

This commit is contained in:
Eelco Dolstra 2012-09-18 14:49:03 -04:00
parent db5c495d98
commit 23deea257d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/text/gnugrep/default.nix
View File

@ -1,19 +1,21 @@
{ stdenv, fetchurl, pcre, libiconv ? null }: { stdenv, fetchurl, pcre, libiconv ? null }:
let version = "2.10"; in let version = "2.14"; in
stdenv.mkDerivation ({ stdenv.mkDerivation {
name = "gnugrep-${version}"; name = "gnugrep-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/grep/grep-${version}.tar.xz"; url = "mirror://gnu/grep/grep-${version}.tar.xz";
sha256 = "1cvsqyfzk1p38fcaav22dn76fkd02g7bjnqna6vrpk9vy9rnfybc"; sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7";
}; };
buildInputs = [ pcre ] buildInputs = [ pcre ]
++ (stdenv.lib.optional (libiconv != null) libiconv); ++ stdenv.lib.optional (libiconv != null) libiconv;
doCheck = if stdenv.isDarwin then false else true; NIX_LDFLAGS = stdenv.lib.optionalString (libiconv != null) "-L${libiconv}/lib -liconv";
doCheck = !stdenv.isDarwin;
# On Mac OS X, force use of mkdir -p, since Grep's fallback # On Mac OS X, force use of mkdir -p, since Grep's fallback
# (./install-sh) is broken. # (./install-sh) is broken.
@ -38,4 +40,4 @@ stdenv.mkDerivation ({
}; };
passthru = {inherit pcre;}; passthru = {inherit pcre;};
} // (if libiconv != null then { NIX_LDFLAGS="-L${libiconv}/lib -liconv"; } else {}) ) }