alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #102123 from lopsided98/nginx-conf-cross

Browse source 
writers.writeNginxConfig: fix cross-compilation
This commit is contained in:
Jörg Thalheim 2020-10-30 12:45:04 +01:00 committed by GitHub
parent 557094a10c 4366281075
commit d420c85a55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/build-support/writers/default.nix
View file

@ -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