diff options
author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-08-15 21:57:57 +0200 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-08-15 22:11:14 +0200 |
commit | ed0f2641cb026a87151b81c94cb4e64f8dca9535 (patch) | |
tree | 4065760cdf418c8a6eae8a4874440fd78cd72b73 /pkgs/servers/apcupsd | |
parent | 9e1cde78b80a0b039ffea7e4a4d4d602026be6ba (diff) | |
download | nixpkgs-ed0f2641cb026a87151b81c94cb4e64f8dca9535.tar nixpkgs-ed0f2641cb026a87151b81c94cb4e64f8dca9535.tar.gz nixpkgs-ed0f2641cb026a87151b81c94cb4e64f8dca9535.tar.bz2 nixpkgs-ed0f2641cb026a87151b81c94cb4e64f8dca9535.tar.lz nixpkgs-ed0f2641cb026a87151b81c94cb4e64f8dca9535.tar.xz nixpkgs-ed0f2641cb026a87151b81c94cb4e64f8dca9535.tar.zst nixpkgs-ed0f2641cb026a87151b81c94cb4e64f8dca9535.zip |
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
Diffstat (limited to 'pkgs/servers/apcupsd')
-rw-r--r-- | pkgs/servers/apcupsd/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index 72951c168dc..e5c545c37bb 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 = '' |