From ed0f2641cb026a87151b81c94cb4e64f8dca9535 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Tue, 15 Aug 2017 21:57:57 +0200 Subject: apcupsd: unbreak build Fix build since commit 093cc00cdd9d8cf31ecce5bc1dd3645c460a1b98 ("cc-wrapper: Always export environment variables for binutils"). The apcupsd build system uses "$(STRIP)" as flags for the "install" program. Now that $STRIP is the path to the strip binary, we cannot pass that to "install". Fixes this: ... COPY multimon.cgi => /nix/store/...-apcupsd-3.14.14/libexec/cgi-bin /nix/store/...-coreutils-8.27/bin/install: cannot stat 'strip': No such file or directory --- pkgs/servers/apcupsd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/servers/apcupsd') diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 72951c168dce..e5c545c37bbb 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; + prePatch = '' + sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \ + -i ./src/apcagent/Makefile ./autoconf/targets.mak + ''; + # ./configure ignores --prefix, so we must specify some paths manually # There is no real reason for a bin/sbin split, so just use bin. preConfigure = '' -- cgit 1.4.1