Merge pull request #23602 from periklis/topic_qt57_darwin

qt57: darwin compatibility
NixOS · Mar 10, 2017 · 4c0737e · 4c0737e
2 parents 943c4ed + c663f6a
commit 4c0737e
Show file tree

Hide file tree

Showing 4 changed files with 479 additions and 37 deletions.
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -107,12 +107,12 @@ let
       makeQtWrapper =
         makeSetupHook
         { deps = [ makeWrapper ]; }
-        ../make-qt-wrapper.sh;
+        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
       qmakeHook =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
-        ../qmake-hook.sh;
+        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
 
     };