Merge pull request #16159 from matthewbauer/neovim-darwin-fixes

Neovim darwin fixes

pkgs/applications/editors/neovim/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, gettext, glib, libmsgpack, libtermkey
-, libtool, libuv, lua, luajit, luaPackages, man, ncurses, perl, pkgconfig
+, libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig
 , unibilium, makeWrapper, vimUtils, xsel
 
 , withPython ? true, pythonPackages, extraPythonPackages ? []
@@ -75,20 +75,14 @@ let
       glib
       libtermkey
       libuv
-      # For some reason, `luajit` has to be listed after `lua`. See
-      # https://github.com/NixOS/nixpkgs/issues/14442
-      lua
-      luajit
       libmsgpack
       ncurses
       neovimLibvterm
       unibilium
-
-      luaPackages.lpeg
-      luaPackages.mpack
-      luaPackages.luabitop
-
-    ] ++ optional withJemalloc jemalloc;
+      luajit
+      luaPackages.lua
+    ] ++ optional withJemalloc jemalloc
+      ++ lualibs;
 
     nativeBuildInputs = [
       cmake
@@ -97,11 +91,13 @@ let
       pkgconfig
     ];
 
-    LUA_CPATH = "${luaPackages.lpeg}/lib/lua/${lua.luaversion}/?.so;${luaPackages.mpack}/lib/lua/${lua.luaversion}/?.so;${luaPackages.luabitop}/lib/lua/${lua.luaversion}/?.so";
+    LUA_PATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaPath lualibs);
+    LUA_CPATH = stdenv.lib.concatStringsSep ";" (map luaPackages.getLuaCPath lualibs);
 
-    configureFlags = [
-      "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
-      "-DENABLE_JEMALLOC=ON"
+    lualibs = [ luaPackages.mpack luaPackages.lpeg luaPackages.luabitop ];
+
+    cmakeFlags = [
+      "-DLUA_PRG=${luaPackages.lua}/bin/lua"
     ];
 
     preConfigure = ''

pkgs/development/libraries/libmpack/default.nix

@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
     inherit rev;
     sha256 = "1h3pbmykm69gfyi0wz647gz5836a6f3jc4azzll7i3mkpc11gcrd";
   };
+  LIBTOOL = "libtool";
   buildInputs = [ libtool ];
   installPhase = ''
     mkdir -p $out/lib/libmpack

pkgs/top-level/lua-packages.nix

@@ -19,6 +19,11 @@ let
   inherit lua;
   inherit (stdenv.lib) maintainers;
 
+  # helper functions for dealing with LUA_PATH and LUA_CPATH
+  getPath       = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
+  getLuaPath    = lib : getPath lib "lua";
+  getLuaCPath   = lib : getPath lib "so";
+
   #define build lua package function
   buildLuaPackage = callPackage ../development/lua-modules/generic lua;
 
@@ -398,6 +403,7 @@ let
     preInstall = ''
       mkdir -p $out/lib/lua/${lua.luaversion}
     '';
+    NIX_CFLAGS_COMPILE = "-Wno-error -fpic";
     installFlags = [
       "USE_SYSTEM_LUA=yes"
       "LUA_VERSION_MAJ_MIN="