luaPackages.pulseaudio: Move to generated

NixOS · Jan 26, 2020 · 5513dd2 · 5513dd2
1 parent d21ce96
commit 5513dd2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 33 deletions.
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
@@ -1553,6 +1553,24 @@ 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
@@ -294,6 +294,9 @@ with super;
  };
  });
 
+ pulseaudio = super.pulseaudio.override({
+ nativeBuildInputs = [ pkgs.pulseaudio pkgs.pkg-config ];
+ });
 
  rapidjson = super.rapidjson.override({
  preBuild = ''

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
@@ -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";