alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

I did not enable well the -fPIC for lua in my last commit. 2nd attempt, for vlc to build fine.

Browse source 
Making vlc build finally (disabling dbus in it)

svn path=/nixpkgs/trunk/; revision=22415
This commit is contained in:
Lluís Batlle i Rossell 2010-06-25 18:34:35 +00:00
parent 90ea2d1111
commit 9885a6a4da
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/video/vlc/default.nix
View file

@ -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 \

2
pkgs/development/interpreters/lua-5/default.nix
View file

@ -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 ];