From 4de8cbfb16707dfed1d695a7fc1da09cb6e2bf38 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 6 Jun 2021 18:30:46 +0000 Subject: [PATCH] bmake.passthru.setupHook: set some defaults These are all read from the environment by the default bmake stdlib (e.g. , ). Some of the default values (like building cat pages instead of man pages, or stripping binaries when installing) don't really make sense for Nixpkgs, so we override them here for every build using bmake. Eventually I'd like to unify the bmake setupHook and the NetBSD make setupHook, but not today. --- .../tools/build-managers/bmake/setup-hook.sh | 10 ++++++++++ pkgs/servers/http/bozohttpd/default.nix | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/development/tools/build-managers/bmake/setup-hook.sh index ae8f78ec90f..c5ca27dd910 100644 --- a/pkgs/development/tools/build-managers/bmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/bmake/setup-hook.sh @@ -1,3 +1,13 @@ +addMakeFlags() { + export prefix="$out" + export MANDIR="${!outputMan}/share/man" + export MANTARGET=man + export BINOWN= + export STRIP_FLAG= +} + +preConfigureHooks+=(addMakeFlags) + bmakeBuildPhase() { runHook preBuild diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index c01be041e86..1574a953b17 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt" ++ optional (luaSupport) "-llua" ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ]; - makeFlags = [ "LDADD=$(_LDADD)" "prefix=$(out)" "MANDIR=$(out)/share/man" "BINOWN=" ]; + makeFlags = [ "LDADD=$(_LDADD)" ]; doCheck = true; checkInputs = [ inetutils wget ];