Fixing lua and perl for radare.

svn path=/nixpkgs/trunk/; revision=15230

3 files changed, 17 insertions, 3 deletions

diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix
index db83ade8fd45..083e32c2eb9e 100644
--- a/pkgs/development/tools/analysis/radare/default.nix
+++ b/pkgs/development/tools/analysis/radare/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, pkgconfig, gtk, libusb, readline, lua, gtkdialog,
-  python, ruby, libewf, vte}:
+  python, ruby, libewf, vte, perl}:
 
 stdenv.mkDerivation {
   name = "radare-1.2.2";
@@ -9,8 +9,10 @@ stdenv.mkDerivation {
     sha256 = "0624ic97s1b70ijbr16b33p76mls8rziqwla6bq29l554dh2hfn4";
   };
 
+  patches = [ ./lua.patch ];
+
   buildInputs = [pkgconfig gtk readline libusb lua gtkdialog python
-    ruby libewf vte];
+    ruby libewf vte perl];
 
   meta = {
     description = "Free advanced command line hexadecimal editor";
diff --git a/pkgs/development/tools/analysis/radare/lua.patch b/pkgs/development/tools/analysis/radare/lua.patch
new file mode 100644
index 000000000000..3a2ca0d505d4
--- /dev/null
+++ b/pkgs/development/tools/analysis/radare/lua.patch
@@ -0,0 +1,12 @@
+diff --git a/src/plug/hack/Makefile b/src/plug/hack/Makefile
+index b05d8dd..d6c73f9 100644
+--- a/src/plug/hack/Makefile
++++ b/src/plug/hack/Makefile
+@@ -7,7 +7,6 @@ PERL_LIBS=`perl -MExtUtils::Embed -e ldopts` -lncurses
+ PY_CFLAGS=-I${PREFIX}/include/python2.5/ -I/usr/include/python2.5/
+ PY_LIBS=-lpython2.5
+ LUA_CFLAGS=-I${PREFIX}/include/lua5.1/ -I/usr/include/lua5.1/
+-LUA_LIBS=
+ RUBY_CFLAGS=-I/usr/lib/ruby/1.8/i386-linux
+ RUBY_LIBS=-lruby18
+ SO=${SHARED_EXT}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15fc21876376..ccdffd6633c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2606,7 +2606,7 @@ let
 
   radare = import ../development/tools/analysis/radare {
     inherit stdenv fetchurl pkgconfig libusb readline gtkdialog python
-      ruby libewf;
+      ruby libewf perl;
     inherit (gtkLibs) gtk;
     inherit (gnome) vte;
     lua = lua5;