01/02: gnu: grep: Add dependency on PCRE.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 20bf5fce7dbdc754a6c430abbeb50fb0662bda38
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jan 11 17:56:05 2018 +0100

    gnu: grep: Add dependency on PCRE.
    
    Suggested by Oleg Pykhalov <address@hidden>
    and Roel Janssen <address@hidden>.
    
    * gnu/packages/base.scm (grep)[inputs]: New field.
    * gnu/packages/commencement.scm (grep-final)[inputs]: New field.
---
 gnu/packages/base.scm         | 4 +++-
 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 9cb628d..5fcfc90 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 
<address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2014 Andreas Enge <address@hidden>
 ;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
@@ -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 c5c0068..4a9aed0 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 
<address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
<address@hidden>
 ;;; Copyright © 2014 Andreas Enge <address@hidden>
 ;;; Copyright © 2012 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <address@hidden>
@@ -884,6 +884,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a 
\"address@hidden"~%"
   (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)