Author: viric Date: 2010-06-25 18:34:35 +0000 (Fri, 25 Jun 2010) New Revision: 22415
You can view the changes in this commit at: https://svn.nixos.org/viewvc/nix?rev=22415&view=rev Modified: nixpkgs/trunk/pkgs/applications/video/vlc/default.nix nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix Log: 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) Changes: Modified: nixpkgs/trunk/pkgs/applications/video/vlc/default.nix =================================================================== --- nixpkgs/trunk/pkgs/applications/video/vlc/default.nix 2010-06-25 18:21:19 UTC (rev 22414) +++ nixpkgs/trunk/pkgs/applications/video/vlc/default.nix 2010-06-25 18:34:35 UTC (rev 22415) @@ -18,7 +18,16 @@ 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 \ Modified: nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix =================================================================== --- nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix 2010-06-25 18:21:19 UTC (rev 22414) +++ nixpkgs/trunk/pkgs/development/interpreters/lua-5/default.nix 2010-06-25 18:34:35 UTC (rev 22415) @@ -6,7 +6,7 @@ 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 ]; _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
