Skip to content

Commit

Permalink
apache: cleanup, remove ? null, remove extra lib., remove let in, upd…
Browse files Browse the repository at this point in the history
…ate homepage
  • Loading branch information
SuperSandro2000 committed Oct 5, 2021
1 parent c130b07 commit 4732298
Showing 1 changed file with 10 additions and 17 deletions.
27 changes: 10 additions & 17 deletions pkgs/servers/http/apache-httpd/2.4.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
, luaSupport ? false, lua5
}:

let inherit (lib) optional;
in

assert sslSupport -> aprutil.sslSupport && openssl != null;
assert ldapSupport -> aprutil.ldapSupport && openldap != null;
assert http2Support -> nghttp2 != null;

stdenv.mkDerivation rec {
pname = "apache-httpd";
version = "2.4.50";
Expand All @@ -29,15 +22,15 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" "doc" ];
setOutputFlags = false; # it would move $out/modules, etc.

buildInputs = [perl] ++
optional brotliSupport brotli ++
optional sslSupport openssl ++
optional ldapSupport openldap ++ # there is no --with-ldap flag
optional libxml2Support libxml2 ++
optional http2Support nghttp2 ++
optional stdenv.isDarwin libiconv;
buildInputs = [ perl ] ++
lib.optional brotliSupport brotli ++
lib.optional sslSupport openssl ++
lib.optional ldapSupport openldap ++ # there is no --with-ldap flag
lib.optional libxml2Support libxml2 ++
lib.optional http2Support nghttp2 ++
lib.optional stdenv.isDarwin libiconv;

prePatch = ''
postPatch = ''
sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|'
'';
Expand Down Expand Up @@ -93,9 +86,9 @@ stdenv.mkDerivation rec {

meta = with lib; {
description = "Apache HTTPD, the world's most popular web server";
homepage = "http:https://httpd.apache.org/";
homepage = "https:https://httpd.apache.org/";
license = licenses.asl20;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ lovek323 peti ];
};
}

0 comments on commit 4732298

Please sign in to comment.