diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-01-11 17:56:05 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-01-11 22:49:15 +0100 |
| commit | 20bf5fce7dbdc754a6c430abbeb50fb0662bda38 (patch) | |
| tree | e69f9ae5f63e3246c7701d95c5b14f3a1cb19744 | |
| parent | 33ca12f3e4b872123118472a4b56ee37ec165f56 (diff) | |
| download | guix-20bf5fce7dbdc754a6c430abbeb50fb0662bda38.tar.gz | |
gnu: grep: Add dependency on PCRE.
Suggested by Oleg Pykhalov <go.wigust@gmail.com> and Roel Janssen <roel@gnu.org>. * gnu/packages/base.scm (grep)[inputs]: New field. * gnu/packages/commencement.scm (grep-final)[inputs]: New field.
| -rw-r--r-- | gnu/packages/base.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/commencement.scm | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9cb628d8d7..5fcfc90e56 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> @@ -38,6 +38,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages perl) #:use-module (gnu packages linux) + #:use-module (gnu packages pcre) #:use-module (gnu packages texinfo) #:use-module (gnu packages hurd) #:use-module (gnu packages pkg-config) @@ -93,6 +94,7 @@ command-line arguments, multiple languages, and so on.") "grep-gnulib-lock.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ;some of the tests require it + (inputs `(("pcre" ,pcre))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c5c00688e4..4a9aed09c1 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org> @@ -884,6 +884,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (package-with-bootstrap-guile (package-with-explicit-inputs (package (inherit grep) + (inputs '()) ;no PCRE support (native-inputs `(("perl" ,perl-boot0)))) %boot5-inputs (current-source-location) |