From 43662810755ce7814c5398ee6551ea337cb40403 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Thu, 29 Oct 2020 20:22:29 -0400 Subject: writers.writeNginxConfig: fix cross-compilation Native versions of awk, sed and gixy need to be used. --- pkgs/build-support/writers/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/build-support/writers/default.nix') diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 495a56b4197..9c709921d21 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ pkgs, lib, gawk, gnused, gixy }: with lib; rec { @@ -219,10 +219,11 @@ rec { writeNginxConfig = name: text: pkgs.runCommandLocal name { inherit text; passAsFile = [ "text" ]; + nativeBuildInputs = [ gawk gnused gixy ]; } /* sh */ '' # nginx-config-formatter has an error - https://github.com/1connect/nginx-config-formatter/issues/16 - ${pkgs.gawk}/bin/awk -f ${awkFormatNginx} "$textPath" | ${pkgs.gnused}/bin/sed '/^\s*$/d' > $out - ${pkgs.gixy}/bin/gixy $out + awk -f ${awkFormatNginx} "$textPath" | sed '/^\s*$/d' > $out + gixy $out ''; # writePerl takes a name an attributeset with libraries and some perl sourcecode and -- cgit 1.4.1