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

automake111x: fix for perl5.26 ("Unescaped left brace in regex is illegal here") (#42649)

Browse Source
This commit is contained in:
volth 2018-06-27 14:27:58 +00:00 committed by xeji
parent dda16ec6ad
commit b43c7bd934
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/misc/automake/automake-1.11.x.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5"; sha256 = "1ffbc6cc41f0ea6c864fbe9485b981679dc5e350f6c4bc6c3512f5a4226936b5";
}; };
patches = [ ./fix-test-autoconf-2.69.patch ]; patches = [ ./fix-test-autoconf-2.69.patch ./fix-perl-5.26.patch ];
buildInputs = [perl autoconf makeWrapper]; buildInputs = [perl autoconf makeWrapper];

10
pkgs/development/tools/misc/automake/fix-perl-5.26.patch Normal file
View File

@ -0,0 +1,10 @@
--- automake-1.11.2/automake.in
+++ automake-1.11.2/automake.in
@@ -4156,7 +4156,7 @@ sub substitute_ac_subst_variables_worker($)
sub substitute_ac_subst_variables ($)
{
my ($text) = @_;
- $text =~ s/\${([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
+ $text =~ s/\$\{([^ \t=:+{}]+)}/&substitute_ac_subst_variables_worker ($1)/ge;
return $text;
}