Merge staging-next into staging

2019-10-16 11:17:12 +02:00
parent 41abe12bb3 22bbaf09fe
commit 12441bdf9f
549 changed files with 8805 additions and 5948 deletions
@@ -159,9 +159,7 @@ let
      qmake = makeSetupHook {
        deps = [ self.qtbase.dev ];
        substitutions = {
-          inherit (stdenv) isDarwin;
-          qtbase_dev = self.qtbase.dev;
-          fix_qt_builtin_paths = ../hooks/fix-qt-builtin-paths.sh;
+          fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
        };
      } ../hooks/qmake-hook.sh;