diff --git a/pkgs/development/interpreters/lua-5/sec.nix b/pkgs/development/interpreters/lua-5/sec.nix index 33def9c51fd4..08eb1c89308c 100644 --- a/pkgs/development/interpreters/lua-5/sec.nix +++ b/pkgs/development/interpreters/lua-5/sec.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lua5, lua5_sockets, openssl }: +{ stdenv, fetchurl, lua5, openssl }: stdenv.mkDerivation rec { version = "0.5"; diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index 9c6cea38170e..018fb201bcda 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lua5}: +{ stdenv, fetchurl, lua5 }: stdenv.mkDerivation rec { name = "lua-sockets-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "19ichkbc4rxv00ggz8gyf29jibvc2wq9pqjik0ll326rrxswgnag"; }; - luaver = "5.1"; # TODO + luaver = lua5.luaversion; patchPhase = '' 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}," \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 417c220fff02..3a0aefe1d199 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3652,10 +3652,12 @@ let lua5 = lua5_2_compat; 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_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 { lua = lua5; @@ -9027,7 +9029,10 @@ let 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 { }; @@ -9491,6 +9496,7 @@ let mpv = callPackage ../applications/video/mpv { lua = lua5_1; + lua5_sockets = lua5_1_sockets; bs2bSupport = config.mpv.bs2bSupport or true; quviSupport = config.mpv.quviSupport or false; cacaSupport = config.mpv.cacaSupport or true;