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

lua5 sockets: our version only works with lua 5.1

Browse source
This commit is contained in:
Vladimír Čunát 2014-09-09 21:24:15 +02:00
parent 15cb79e48e
commit d09736b7c1
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, lua5, lua5_sockets, openssl }: { stdenv, fetchurl, lua5, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.5"; version = "0.5";

4
pkgs/development/interpreters/lua-5/sockets.nix
View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, lua5}: { stdenv, fetchurl, lua5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lua-sockets-${version}"; name = "lua-sockets-${version}";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag";
}; };
luaver = "5.1"; # TODO luaver = lua5.luaversion;
patchPhase = '' patchPhase = ''
sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \ sed -e "s,^INSTALL_TOP_SHARE.*,INSTALL_TOP_SHARE=$out/share/lua/${lua5.luaversion}," \
-e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \ -e "s,^INSTALL_TOP_LIB.*,INSTALL_TOP_LIB=$out/lib/lua/${lua5.luaversion}," \

12
pkgs/top-level/all-packages.nix
View file

@ -3652,10 +3652,12 @@ let
lua5 = lua5_2_compat; lua5 = lua5_2_compat;
lua = lua5; lua = lua5;
lua5_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {}; lua5_1_sockets = callPackage ../development/interpreters/lua-5/sockets.nix {
lua5 = lua5_1; # version 2.* only works with 5.1
};
lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {};
lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {}; lua5_filesystem = callPackage ../development/interpreters/lua-5/filesystem.nix {};
lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix {}; lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { };
luarocks = callPackage ../development/tools/misc/luarocks { luarocks = callPackage ../development/tools/misc/luarocks {
lua = lua5; lua = lua5;
@ -9027,7 +9029,10 @@ let
praat = callPackage ../applications/audio/praat { }; praat = callPackage ../applications/audio/praat { };
quvi = callPackage ../applications/video/quvi/tool.nix { }; quvi = callPackage ../applications/video/quvi/tool.nix {
lua5_sockets = lua5_1_sockets;
lua5 = lua5_1;
};
quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { }; quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
@ -9491,6 +9496,7 @@ let
mpv = callPackage ../applications/video/mpv { mpv = callPackage ../applications/video/mpv {
lua = lua5_1; lua = lua5_1;
lua5_sockets = lua5_1_sockets;
bs2bSupport = config.mpv.bs2bSupport or true; bs2bSupport = config.mpv.bs2bSupport or true;
quviSupport = config.mpv.quviSupport or false; quviSupport = config.mpv.quviSupport or false;
cacaSupport = config.mpv.cacaSupport or true; cacaSupport = config.mpv.cacaSupport or true;