treewide: *inputs are lists

This commit is contained in:
Robin Gloster
2019-12-31 01:09:25 +01:00
committed by Jan Tojnar
parent 01e8c64988
commit 760e23136a
18 changed files with 45 additions and 52 deletions
+1 -4
View File
@@ -44,10 +44,6 @@ stdenv.mkDerivation rec {
# Required for pthread_cancel.
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
preConfigure = ''
configureFlags="$configureFlags --includedir=$dev/include"
'';
configureFlags = [
"--with-apr=${apr.dev}"
"--with-apr-util=${aprutil.dev}"
@@ -60,6 +56,7 @@ stdenv.mkDerivation rec {
"--enable-cern-meta"
"--enable-imagemap"
"--enable-cgi"
"--includedir=${placeholder "dev"}/include"
(stdenv.lib.enableFeature proxySupport "proxy")
(stdenv.lib.enableFeature sslSupport "ssl")
(stdenv.lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")