Revert "Merge pull request #23602 from periklis/topic_qt57_darwin"

This reverts commit 4c0737e, reversing changes made to 943c4ed.
NixOS · Mar 10, 2017 · a2eae3b · a2eae3b · bjornfor · Mar 11, 2017
1 parent 77c4979
commit a2eae3b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 479 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 ]; }
-        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
+        ../make-qt-wrapper.sh;
 
       qmakeHook =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
-        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
+        ../qmake-hook.sh;
 
     };