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

bozohttpd: minor formatting

Browse Source 
The Nix style guide isn't exactly comprehensive, but this at least seems
slightly closer to the examples:

https://nixos.org/manual/nixpkgs/stable/#sec-syntax

I'm annoyed that nixpkgs-fmt as of writing won't accept:

  COPTS = [
    # ...
  ] ++ optional (...) "..."
    ++ optional (...) "...";

...which seems to be the actual convention, looking at eg. pkgs.nginx.
This commit is contained in:
embr 2021-05-31 10:47:46 +02:00
parent f4f05481e3
commit ee4b583ae8
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkgs/servers/http/bozohttpd/default.nix
View File

@ -45,25 +45,24 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl ] ++ optional (luaSupport) lua; buildInputs = [ openssl ] ++ optional (luaSupport) lua;
nativeBuildInputs = [ bmake groff ]; nativeBuildInputs = [ bmake groff ];
COPTS = COPTS = [
[ "-D_DEFAULT_SOURCE"
"-D_DEFAULT_SOURCE" "-D_GNU_SOURCE"
"-D_GNU_SOURCE"
# Ensure that we can serve >2GB files even on 32-bit systems. # ensure that we can serve >2GB files even on 32-bit systems.
"-D_LARGEFILE_SOURCE" "-D_LARGEFILE_SOURCE"
"-D_FILE_OFFSET_BITS=64" "-D_FILE_OFFSET_BITS=64"
# unpackaged dependency: https://man.netbsd.org/blocklist.3 # unpackaged dependency: https://man.netbsd.org/blocklist.3
"-DNO_BLOCKLIST_SUPPORT" "-DNO_BLOCKLIST_SUPPORT"
] ]
++ optional (!userSupport) "-DNO_USER_SUPPORT" ++ optional (!userSupport) "-DNO_USER_SUPPORT"
++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT" ++ optional (!dirIndexSupport) "-DNO_DIRINDEX_SUPPORT"
++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT" ++ optional (!dynamicContentSupport) "-DNO_DYNAMIC_CONTENT"
++ optional (!luaSupport) "-DNO_LUA_SUPPORT" ++ optional (!luaSupport) "-DNO_LUA_SUPPORT"
++ optional (!sslSupport) "-DNO_SSL_SUPPORT" ++ optional (!sslSupport) "-DNO_SSL_SUPPORT"
++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT" ++ optional (!cgiSupport) "-DNO_CGIBIN_SUPPORT"
++ optional (htpasswdSupport) "-DDO_HTPASSWD"; ++ optional (htpasswdSupport) "-DDO_HTPASSWD";
_LDADD = [ "-lcrypt" "-lm" ] _LDADD = [ "-lcrypt" "-lm" ]
++ optional (luaSupport) "-llua" ++ optional (luaSupport) "-llua"