Merge branch 'master' into staging-next

2019-09-24 08:14:34 +02:00
parent 11c2b06dd2 afd04a49ed
commit eab41878ac
185 changed files with 5276 additions and 3825 deletions
--- a/pkgs/development/lua-modules/overrides.nix
+++ b/pkgs/development/lua-modules/overrides.nix
@@ -276,8 +276,19 @@ with super;
    propagatedBuildInputs = [
      pkgs.libuv
    ];
+
+    passthru = {
+      libluv = self.luv.override({
+        preBuild = self.luv.preBuild + ''
+         sed -i 's,\(option(BUILD_MODULE.*\)ON,\1OFF,' CMakeLists.txt
+         sed -i 's,\(option(BUILD_SHARED_LIBS.*\)OFF,\1ON,' CMakeLists.txt
+         sed -i 's,${"\${INSTALL_INC_DIR}"},${placeholder "out"}/include/luv,' CMakeLists.txt
+        '';
+      });
+    };
  });

+
  rapidjson = super.rapidjson.override({
    preBuild = ''
      sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt