diff options
Diffstat (limited to 'nixpkgs/pkgs/development/lua-modules/overrides.nix')
-rw-r--r-- | nixpkgs/pkgs/development/lua-modules/overrides.nix | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/lua-modules/overrides.nix b/nixpkgs/pkgs/development/lua-modules/overrides.nix index 84a15e8a674b..94edbd0737b7 100644 --- a/nixpkgs/pkgs/development/lua-modules/overrides.nix +++ b/nixpkgs/pkgs/development/lua-modules/overrides.nix @@ -40,11 +40,6 @@ with super; { name = "CRYPTO"; dep = pkgs.openssl; } { name = "OPENSSL"; dep = pkgs.openssl; } ]; - - # https://github.com/wahern/cqueues/issues/227 - NIX_CFLAGS_COMPILE = with pkgs.stdenv; lib.optionalString hostPlatform.isDarwin - "-DCLOCK_MONOTONIC -DCLOCK_REALTIME"; - disabled = luaOlder "5.1" || luaAtLeast "5.4"; # Upstream rockspec is pointlessly broken into separate rockspecs, per Lua # version, which doesn't work well for us, so modify it @@ -81,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 @@ -145,6 +151,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 +308,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 +327,13 @@ with super; sed -i '/set(CMAKE_C_FLAGS/d' CMakeLists.txt ''; }); + + pulseaudio = super.pulseaudio.override({ + buildInputs = [ + pkgs.libpulseaudio + ]; + nativeBuildInputs = [ + pkgs.pulseaudio pkgs.pkgconfig + ]; + }); } |