Merge remote-tracking branch 'origin/staging-next' into staging

2022-04-05 04:05:02 +02:00
parent 17eb9da14b 120925b5cb
commit bf1914e12a
127 changed files with 4439 additions and 4436 deletions
@@ -297,10 +297,6 @@ with prev;

      nativeBuildInputs = [ pkgs.pkg-config pkgs.cmake ]
        ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.fixDarwinDylibNames ];
-
-      # Fixup linking libluv.dylib, for some reason it's not linked against lua correctly.
-      NIX_LDFLAGS = pkgs.lib.optionalString pkgs.stdenv.isDarwin
-        (if isLuaJIT then "-lluajit-${lua.luaversion}" else "-llua");
  };

  luv = prev.lib.overrideLuarocks prev.luv (drv: {