From 8fb0e1613397d43ddd70549a646d18fd6938a577 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 29 Oct 2019 23:21:22 +0100 Subject: [PATCH] munin: *Flags are lists --- pkgs/servers/monitoring/munin/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index d978cb003c7..46e1460d795 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -92,16 +92,16 @@ stdenv.mkDerivation rec { # DESTDIR shouldn't be needed (and shouldn't have worked), but munin # developers have forgotten to use PREFIX everywhere, so we use DESTDIR to # ensure that everything is installed in $out. - makeFlags = '' - PREFIX=$(out) - DESTDIR=$(out) - PERLLIB=$(out)/${perlPackages.perl.libPrefix} - PERL=${perlPackages.perl.outPath}/bin/perl - PYTHON=${python.outPath}/bin/python - RUBY=${ruby.outPath}/bin/ruby - JAVARUN=${jre.outPath}/bin/java - PLUGINUSER=munin - ''; + makeFlags = [ + "PREFIX=$(out)" + "DESTDIR=$(out)" + "PERLLIB=$(out)/${perlPackages.perl.libPrefix}" + "PERL=${perlPackages.perl.outPath}/bin/perl" + "PYTHON=${python.outPath}/bin/python" + "RUBY=${ruby.outPath}/bin/ruby" + "JAVARUN=${jre.outPath}/bin/java" + "PLUGINUSER=munin" + ]; postFixup = '' echo "Removing references to /usr/{bin,sbin}/ from munin plugins..."