Merge branch 'master' into staging

2020-05-22 09:13:23 +00:00
parent eae4f22176 5de1e307f2
commit 16d7f7edae
290 changed files with 7699 additions and 2328 deletions
@@ -73,6 +73,11 @@ stdenv.mkDerivation rec {
    "--docdir=share/doc/${pname}${version}"
  ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
    ++ lib.optional (useQt4 || withQt5) "--qt-gui"
+    # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568
+    ++ lib.optionals stdenv.hostPlatform.is32bit [
+      "CFLAGS=-D_FILE_OFFSET_BITS=64"
+      "CXXFLAGS=-D_FILE_OFFSET_BITS=64"
+    ]
    ++ [
    "--"
    # We should set the proper `CMAKE_SYSTEM_NAME`.