From 20bf5fce7dbdc754a6c430abbeb50fb0662bda38 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Jan 2018 17:56:05 +0100 Subject: gnu: grep: Add dependency on PCRE. Suggested by Oleg Pykhalov and Roel Janssen . * 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(-) (limited to 'gnu') 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 +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -38,6 +38,7 @@ (define-module (gnu packages base) #: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 @@ (define-public grep "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 +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver @@ -884,6 +884,7 @@ (define grep-final (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) -- cgit v1.2.3