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

apcupsd: unbreak build

Browse Source 
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
This commit is contained in:
Bjørn Forsman 2017-08-15 21:57:57 +02:00
parent 9e1cde78b8
commit ed0f2641cb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/servers/apcupsd/default.nix
View File

@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; 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 # ./configure ignores --prefix, so we must specify some paths manually
# There is no real reason for a bin/sbin split, so just use bin. # There is no real reason for a bin/sbin split, so just use bin.
preConfigure = '' preConfigure = ''