~ruther/guix-local: gnu: Adjust to PCRE split.

74c8b174e8015de753ba5cab44f76f944e6fd4ba — Ludovic Courtès 9 years ago 875715c

gnu: Adjust to PCRE split.

This is a followup to commit 6d49ca3bad613700b539c30272e164207455735b.

* gnu/packages/databases.scm (4store)[inputs]: Remove PCRE.
[native-inputs]: Add PCRE:bin.
* gnu/packages/web.scm (httpd): Likewise.

patch browse .tar.gz

2 files changed, 2 insertions(+), 2 deletions(-)

M gnu/packages/databases.scm
M gnu/packages/web.scm

M gnu/packages/databases.scm => gnu/packages/databases.scm +1 -1

@@ 86,6 86,7 @@
        ("automake" ,automake)
        ("gettext" ,gnu-gettext)
        ("libtool" ,libtool)
+       ("pcre" ,pcre "bin")                       ;for 'pcre-config'
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("glib" ,glib)


@@ 94,7 95,6 @@
        ("raptor2" ,raptor2)
        ("readline" ,readline)
        ("avahi" ,avahi)
-       ("pcre" ,pcre)
        ("cyrus-sasl" ,cyrus-sasl)
        ("openssl" ,openssl)
        ("util-linux" ,util-linux)))

M gnu/packages/web.scm => gnu/packages/web.scm +1 -1

@@ 84,10 84,10 @@
               (base32
                "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc"))))
     (build-system gnu-build-system)
+    (native-inputs `(("pcre" ,pcre "bin")))       ;for 'pcre-config'
     (inputs `(("apr" ,apr)
               ("apr-util" ,apr-util)
               ("openssl" ,openssl)
-              ("pcre" ,pcre)
               ("perl" ,perl))) ; needed to run bin/apxs
     (arguments
      `(#:test-target "test"