From 9885a6a4da9c95e3d7e5e5dae08c8094f6484a2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Fri, 25 Jun 2010 18:34:35 +0000
Subject: [PATCH] I did not enable well the -fPIC for lua in my last commit.
 2nd attempt, for vlc to build fine. Making vlc build finally (disabling dbus
 in it)

svn path=/nixpkgs/trunk/; revision=22415
---
 pkgs/applications/video/vlc/default.nix         | 11 ++++++++++-
 pkgs/development/interpreters/lua-5/default.nix |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 8f20bdd0d1cf..c26a00c52232 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -18,7 +18,16 @@ stdenv.mkDerivation {
     libvorbis libtheora speex lua libgcrypt
   ];
 
-  configureFlags = "--enable-alsa --disable-glx --disable-remoteosd --enable-faad --enable-theora --enable-vorbis --enable-speex";
+  configureFlags = [ "--enable-alsa"
+    "--disable-glx"
+    "--disable-remoteosd"
+    "--enable-faad"
+    "--enable-theora"
+    "--enable-vorbis"
+    "--enable-speex"
+    "--disable-dbus"
+    "--disable-dbus-control"
+  ];
 
   preBuild = ''
     substituteInPlace modules/misc/freetype.c --replace \
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index e88d5851c351..5a35df4c513d 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     url = http://www.lua.org/ftp/lua-5.1.4.tar.gz;
     sha256 = "0fmgk100ficm1jbm4ga9xy484v4cm89wsdfckdybb9gjx8jy4f5h";
   };
-  makeFlags = [ "MYCFLAGS=-fPIC" ];
+  makeFlags = [ "CFLAGS=-fPIC" ];
   buildFlags = "linux"; # TODO: support for non-linux systems
   installFlags = "install INSTALL_TOP=\${out}";
   buildInputs = [ ncurses readline ];