diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-21 16:24:45 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-21 16:54:28 +0200 |
| commit | a9baea48dfd61f6650a9c72b9b106479329eaddf (patch) | |
| tree | f7ed92bd3ddce9c0a9679d3a13d7056b97196c4b /pkgs | |
| parent | f25f21b78c5bb696f89fdc61213db8dedce8fcaf (diff) | |
| download | nixlib-a9baea48dfd61f6650a9c72b9b106479329eaddf.tar nixlib-a9baea48dfd61f6650a9c72b9b106479329eaddf.tar.gz nixlib-a9baea48dfd61f6650a9c72b9b106479329eaddf.tar.bz2 nixlib-a9baea48dfd61f6650a9c72b9b106479329eaddf.tar.lz nixlib-a9baea48dfd61f6650a9c72b9b106479329eaddf.tar.xz nixlib-a9baea48dfd61f6650a9c72b9b106479329eaddf.tar.zst nixlib-a9baea48dfd61f6650a9c72b9b106479329eaddf.zip | |
openjade: Use default perl
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/text/sgml/openjade/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/sgml/openjade/msggen.patch | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 37 insertions, 3 deletions
diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index a2920345afa7..3427f62f15bc 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; + patches = [ ./msggen.patch ]; + buildInputs = [ opensp perl ]; configureFlags = [ diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/pkgs/tools/text/sgml/openjade/msggen.patch new file mode 100644 index 000000000000..d59573fa49cf --- /dev/null +++ b/pkgs/tools/text/sgml/openjade/msggen.patch @@ -0,0 +1,34 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch?revision=1.2 + +Use Getopt::Std in place of getopts.pl. +https://bugs.gentoo.org/show_bug.cgi?id=420083 + +--- a/msggen.pl ++++ b/msggen.pl +@@ -4,6 +4,7 @@ + # See the file COPYING for copying permission. + + use POSIX; ++use Getopt::Std; + + # Package and version. + $package = 'openjade'; +@@ -18,8 +19,7 @@ + undef $opt_l; + undef $opt_p; + undef $opt_t; +-do 'getopts.pl'; +-&Getopts('l:p:t:'); ++getopts('l:p:t:'); + $module = $opt_l; + $pot_file = $opt_p; + +@@ -72,7 +72,7 @@ + else { + $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");; + $type[$num] = substr($field[0], 0, 1); +- $argc = int(substr($field[0], 1, 1)); ++ $argc = substr($field[0], 1, 1); + } + $nargs[$num] = $argc; + $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77a615abae1..6bcb5a7a9bf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1712,9 +1712,7 @@ let opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; - openjade = callPackage ../tools/text/sgml/openjade { - perl = perl510; - }; + openjade = callPackage ../tools/text/sgml/openjade { }; openobex = callPackage ../tools/bluetooth/openobex { }; |