public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/servers: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 14:24:03 +07:00
parent e245ae3c3a
commit 872973d7d1
172 changed files with 454 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-httpd/2.4.nix
+12 -12
View File
@@ -8,7 +8,7 @@
, luaSupport ? false, lua5
}:
let inherit (stdenv.lib) optional;
let inherit (lib) optional;
in
assert sslSupport -> aprutil.sslSupport && openssl != null;
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
'';
# Required for ‘pthread_cancel’.
NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
configureFlags = [
"--with-apr=${apr.dev}"
@@ -57,19 +57,19 @@ stdenv.mkDerivation rec {
"--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")
(lib.enableFeature proxySupport "proxy")
(lib.enableFeature sslSupport "ssl")
(lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
"--docdir=$(doc)/share/doc"
(stdenv.lib.enableFeature brotliSupport "brotli")
(stdenv.lib.withFeatureAs brotliSupport "brotli" brotli)
(lib.enableFeature brotliSupport "brotli")
(lib.withFeatureAs brotliSupport "brotli" brotli)
(stdenv.lib.enableFeature http2Support "http2")
(stdenv.lib.withFeature http2Support "nghttp2")
(lib.enableFeature http2Support "http2")
(lib.withFeature http2Support "nghttp2")
(stdenv.lib.enableFeature luaSupport "lua")
(stdenv.lib.withFeatureAs luaSupport "lua" lua5)
(lib.enableFeature luaSupport "lua")
(lib.withFeatureAs luaSupport "lua" lua5)
];
enableParallelBuilding = true;
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
description = "Apache HTTPD, the world's most popular web server";
homepage = "http://httpd.apache.org/";
license = licenses.asl20;
platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
platforms = lib.platforms.linux ++ stdenv.lib.platforms.darwin;
maintainers = with maintainers; [ lovek323 peti ];
};
}