nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Adjust to PCRE split. 

This is a followup to commit 6d49ca3bad.

* gnu/packages/databases.scm (4store)[inputs]: Remove PCRE.
[native-inputs]: Add PCRE:bin.
* gnu/packages/web.scm (httpd): Likewise.
This commit is contained in:
Ludovic Courtès 2016-06-24 23:54:00 +02:00
parent 875715cabf
commit 74c8b174e8
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/databases.scm
View File

@ -86,6 +86,7 @@
("automake" ,automake) ("automake" ,automake)
("gettext" ,gnu-gettext) ("gettext" ,gnu-gettext)
("libtool" ,libtool) ("libtool" ,libtool)
("pcre" ,pcre "bin") ;for 'pcre-config'
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
@ -94,7 +95,6 @@
("raptor2" ,raptor2) ("raptor2" ,raptor2)
("readline" ,readline) ("readline" ,readline)
("avahi" ,avahi) ("avahi" ,avahi)
("pcre" ,pcre)
("cyrus-sasl" ,cyrus-sasl) ("cyrus-sasl" ,cyrus-sasl)
("openssl" ,openssl) ("openssl" ,openssl)
("util-linux" ,util-linux))) ("util-linux" ,util-linux)))

2
gnu/packages/web.scm
View File

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