diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index e34d9044f3886..a901eab90f67e 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -77,5 +77,4 @@ say,,,,, std__debug,std._debug,,,, std_normalize,std.normalize,,,, stdlib,,,,,vyp -pulseaudio,,,,,doronbehar vstruct,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2dbda51bfe8bc..ec27182f832b7 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1455,24 +1455,6 @@ stdlib = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; -pulseaudio = buildLuarocksPackage { - pname = "pulseaudio"; - version = "0.2-1"; - - src = fetchurl { - url = "mirror://luarocks/pulseaudio-0.2-1.src.rock"; - sha256 = "06w8fmwddrpm02yam818yi30gghw4ckb18zljjncy3x0zfijyhz7"; - }; - disabled = (luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/doronbehar/lua-pulseaudio"; - description = "Bindings to libpulse"; - maintainers = with maintainers; [ doronbehar ]; - license.fullName = "Apache v2.0"; - }; -}; vstruct = buildLuarocksPackage { pname = "vstruct"; version = "2.0.2-1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 30be2c197a5de..4bf888dd79961 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -316,13 +316,4 @@ with super; sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt ''; }); - - pulseaudio = super.pulseaudio.override({ - buildInputs = [ - pkgs.libpulseaudio - ]; - nativeBuildInputs = [ - pkgs.pulseaudio pkgs.pkgconfig - ]; - }); } diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index d120e9f7a7f27..2fc0b43422da9 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -160,5 +160,37 @@ with self; { }; }); + pulseaudio = buildLuaPackage rec { + name = "pulseaudio-${version}"; + version = "0.2-1"; + + 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 = "Bindings to libpulse"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.lgpl21; + }; + }; + }); in packages