mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
lyaml: init at 6.2.5-1, update all generated packages
This commit is contained in:
parent
eadc576026
commit
bd400bd006
@ -65,6 +65,7 @@ luazip,,,,,
|
||||
lua-yajl,,,,,pstn
|
||||
luuid,,,,,
|
||||
luv,,,,,
|
||||
lyaml,,,,,lblasc
|
||||
markdown,,,,,
|
||||
mediator_lua,,,,,
|
||||
mpack,,,,,
|
||||
|
|
File diff suppressed because it is too large
Load Diff
@ -145,6 +145,14 @@ with super;
|
||||
];
|
||||
});
|
||||
|
||||
lua-lsp = super.lua-lsp.override({
|
||||
# until Alloyed/lua-lsp#28
|
||||
postConfigure = ''
|
||||
substituteInPlace ''${rockspecFilename} \
|
||||
--replace '"lpeglabel ~> 1.5",' '"lpeglabel >= 1.5",'
|
||||
'';
|
||||
});
|
||||
|
||||
lua-zlib = super.lua-zlib.override({
|
||||
buildInputs = [
|
||||
pkgs.zlib.dev
|
||||
@ -294,6 +302,12 @@ with super;
|
||||
};
|
||||
});
|
||||
|
||||
lyaml = super.lyaml.override({
|
||||
buildInputs = [
|
||||
pkgs.libyaml
|
||||
];
|
||||
});
|
||||
|
||||
mpack = super.mpack.override({
|
||||
buildInputs = [ pkgs.libmpack ];
|
||||
# the rockspec doesn't use the makefile so you may need to export more flags
|
||||
@ -307,4 +321,13 @@ with super;
|
||||
sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt
|
||||
'';
|
||||
});
|
||||
|
||||
pulseaudio = super.pulseaudio.override({
|
||||
buildInputs = [
|
||||
pkgs.libpulseaudio
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkgs.pulseaudio pkgs.pkgconfig
|
||||
];
|
||||
});
|
||||
}
|
||||
|
@ -132,39 +132,6 @@ with self; {
|
||||
};
|
||||
};
|
||||
|
||||
pulseaudio = buildLuaPackage rec {
|
||||
pname = "pulseaudio";
|
||||
version = "0.2";
|
||||
name = "pulseaudio-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doronbehar";
|
||||
repo = "lua-pulseaudio";
|
||||
rev = "v${version}";
|
||||
sha256 = "140y1m6k798c4w7xfl0zb0a4ffjz6i1722bgkdcdg8g76hr5r8ys";
|
||||
};
|
||||
disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
|
||||
buildInputs = [ pkgs.libpulseaudio ];
|
||||
propagatedBuildInputs = [ lua ];
|
||||
nativeBuildInputs = [ pkgs.pulseaudio pkgconfig ];
|
||||
|
||||
makeFlags = [
|
||||
"INST_LIBDIR=${placeholder "out"}/lib/lua/${lua.luaversion}"
|
||||
"INST_LUADIR=${placeholder "out"}/share/lua/${lua.luaversion}"
|
||||
"LUA_BINDIR=${placeholder "out"}/bin"
|
||||
];
|
||||
preBuild = ''
|
||||
mkdir -p ${placeholder "out"}/lib/lua/${lua.luaversion}
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/doronbehar/lua-pulseaudio";
|
||||
description = "Libpulse Lua bindings";
|
||||
maintainers = with maintainers; [ doronbehar ];
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
};
|
||||
|
||||
vicious = toLuaModule(stdenv.mkDerivation rec {
|
||||
pname = "vicious";
|
||||
version = "2.3.1";
|
||||
|
Loading…
Reference in New Issue
Block a user