From 52c906147c5bbf65fea3e56954241d69d02fda99 Mon Sep 17 00:00:00 2001 From: pablo1107 Date: Mon, 15 Jun 2020 19:27:16 -0300 Subject: [PATCH] luaPackages.ldbus: init at scm-0 --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 27 +++++++++++++++++++ pkgs/development/lua-modules/overrides.nix | 11 ++++++++ 3 files changed, 39 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 89a1c0bbbe09..8cc63963370d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -18,6 +18,7 @@ dkjson,,,,, fifo,,,,, http,,,,,vcunat inspect,,,,, +ldbus,,http://luarocks.org/dev,,, ldoc,,,,, lgi,,,,, linenoise,,,,, diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2dbda51bfe8b..7eae27d85c6f 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -359,6 +359,33 @@ inspect = buildLuarocksPackage { license.fullName = "MIT "; }; }; +ldbus = buildLuarocksPackage { + pname = "ldbus"; + version = "scm-0"; + + knownRockspec = (fetchurl { + url = "https://luarocks.org/dev/ldbus-scm-0.rockspec"; + sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx"; + }).outPath; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/daurnimator/ldbus.git", + "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", + "date": "2019-08-16T14:26:05+10:00", + "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s", + "fetchSubmodules": true +} + '') ["date"]) ; + + disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/daurnimator/ldbus"; + description = "A Lua library to access dbus."; + license.fullName = "MIT/X11"; + }; +}; ldoc = buildLuarocksPackage { pname = "ldoc"; version = "1.4.6-2"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 30be2c197a5d..94edbd0737b7 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -76,6 +76,17 @@ with super; */ }); + ldbus = super.ldbus.override({ + extraVariables = { + DBUS_DIR="${pkgs.dbus.lib}"; + DBUS_ARCH_INCDIR="${pkgs.dbus.lib}/lib/dbus-1.0/include"; + DBUS_INCDIR="${pkgs.dbus.dev}/include/dbus-1.0"; + }; + buildInputs = with pkgs; [ + dbus + ]; + }); + ljsyscall = super.ljsyscall.override(rec { version = "unstable-20180515"; # package hasn't seen any release for a long time