Merge staging-next into staging

2018-11-18 10:41:34 +01:00
parent 0a085d508a 3aa6b8ccc5
commit 0d0d7dcd06
422 changed files with 65253 additions and 65218 deletions
--- a/pkgs/development/tools/misc/help2man/default.nix
+++ b/pkgs/development/tools/misc/help2man/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
    #! $SHELL -e
    export PERL5LIB=\''${PERL5LIB:+:}$gettext_perl
    ${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin
-        "export PATH=\''${PATH:+:}${gettext}/bin"}
+        ''export PATH=\''${PATH:+:}${gettext}/bin''}
    exec -a \$0 $out/bin/.help2man-wrapped "\$@"
    EOF
    chmod +x $out/bin/help2man