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

Merge pull request #140630 from SuperSandro2000/cleanup

Browse Source
This commit is contained in:
Sandro 2021-10-05 19:01:11 +02:00 committed by GitHub
commit 47e1f798a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -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";
@ -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|'
'';
@ -93,9 +86,9 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Apache HTTPD, the world's most popular web server";
homepage = "http://httpd.apache.org/";
homepage = "https://httpd.apache.org/";
license = licenses.asl20;
platforms = lib.platforms.linux ++ lib.platforms.darwin;
platforms = platforms.linux ++ platforms.darwin;
maintainers = with maintainers; [ lovek323 peti ];
};
}

1
pkgs/servers/monitoring/unifi-poller/default.nix
View File

@ -26,6 +26,5 @@ buildGoModule rec {
homepage = "https://github.com/unifi-poller/unifi-poller";
license = licenses.mit;
maintainers = with maintainers; [ elseym ];
platforms = platforms.unix;
};
}