Skip to content

mpv: don't use generated luasocket #89145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cript0nauta wants to merge 1 commit into from
Closed

mpv: don't use generated luasocket #89145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/applications/video/mpv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ assert xvSupport -> x11Support && available libXv;
assert zimgSupport -> available zimg;

let
luaEnv = lua.withPackages (ps: with ps; [ luasocket ]);
luaEnv = lua.withPackages (ps: with ps; [ luasocket-git ]);

in stdenv.mkDerivation rec {
pname = "mpv";
Expand Down
39 changes: 39 additions & 0 deletions pkgs/top-level/lua-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,45 @@ with self; {

luarocks-nix = callPackage ../development/tools/misc/luarocks/luarocks-nix.nix { };

luasocket-git = buildLuaPackage rec {
name = "socket-${version}";
version = "3.0-rc1";

src = fetchFromGitHub {
owner = "diegonehab";
repo = "luasocket";
rev = "v${version}";
sha256 = "1chs7z7a3i3lck4x7rz60ziwbf793gw169hpjdfca8y4yf1hzsxk";
};

patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace src/makefile \
--replace 10.3 10.5
'';

preBuild = ''
makeFlagsArray=(
LUAV=${lua.luaversion}
PLAT=${platformString}
CC=''${CC}
LD=''${CC}
prefix=$out
);
'';

doCheck = false; # fails to find itself

installTargets = [ "install" "install-unix" ];

meta = with stdenv.lib; {
description = "Network support for Lua";
homepage = "http://w3.impa.br/~diego/software/luasocket/";
license = licenses.mit;
maintainers = with maintainers; [ ];
platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos;
};
};

luxio = buildLuaPackage rec {
name = "luxio-${version}";
version = "13";
Expand Down