openjade: Use default perl

This commit is contained in:
Eelco Dolstra 2014-08-21 16:24:45 +02:00
parent f25f21b78c
commit a9baea48df
3 changed files with 37 additions and 3 deletions

View file

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x";
};
patches = [ ./msggen.patch ];
buildInputs = [ opensp perl ];
configureFlags = [

View file

@ -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");

View file

@ -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 { };