qt5: make qt-5.4.1 default

8 files changed, 15 insertions, 17 deletions

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a339166fd2d03..534c56ed9a013 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -593,7 +593,7 @@ self: super: {
   vivid = markBroken super.vivid;
 
   # Test suite wants to connect to $DISPLAY.
-  hsqml = dontCheck super.hsqml;
+  hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; });
 
   # https://github.com/megantti/rtorrent-rpc/issues/1
   rtorrent-rpc = markBroken super.rtorrent-rpc;
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index 50de473c1ebaf..40efafdea3da2 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ nckx ];
   };
 
-  buildInputs = [ fftw qt5 ];
+  buildInputs = [ fftw qt5.base ];
   propagatedBuildInputs = [ boost ];
 
   patchPhase = ''
diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index 292db910318bd..447b5e45dfb1b 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "16b3mmsf9r1yqqaw89fx0c3bgfg86dz4phry89wqy2hw05szgda3";
   };
 
-  buildInputs = [ opencv qt5 ];
+  buildInputs = [ opencv qt5.base qt5.svg ];
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/development/libraries/phonon/qt4/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix
index df32f04bb6c11..a127c063ffbe2 100644
--- a/pkgs/development/libraries/phonon/qt4/default.nix
+++ b/pkgs/development/libraries/phonon/qt4/default.nix
@@ -1,7 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, pulseaudio
-, qt4 ? null, qt5 ? null, withQt5 ? false }:
-
-assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
+{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }:
 
 with stdenv.lib;
 
@@ -17,12 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
   };
 
-  buildInputs = [ (if withQt5 then qt5 else qt4) pulseaudio ];
+  buildInputs = [ qt4 pulseaudio ];
 
   nativeBuildInputs = [ cmake automoc4 ];
 
-  cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
-
   meta = {
     homepage = http://phonon.kde.org/;
     description = "Multimedia API for Qt";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 7fcedab199b2d..9c7659efcece0 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "19pz27jsdpa3pybj8sghmmd1zqgr73js1mp3875rhx158dav37nz";
   };
 
-  buildInputs = [ qt5 ];
+  buildInputs = [ qt5.base qt5.quick1 ];
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configurePhase = "qmake PREFIX=$out";
 
   installPhase=''make INSTALL_ROOT="$out" install'';
-  
+
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
index e120d0a920c1d..b242661270d24 100644
--- a/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qt-submodule.nix
@@ -20,9 +20,11 @@ mkDerivation (args // {
   dontFixLibtool = args.dontFixLibtool or true;
   configureScript = args.configureScript or "qmake";
 
+  /*
   preConfigure = ''
     export PATH="$out/bin:$PATH"
   '';
+  */
 
   postInstall = ''
     rm "$out/bin/qmake" "$out/bin/qt.conf"
diff --git a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
index ac76590d11745..8ab4071becfb1 100644
--- a/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/setup-hook.sh
@@ -28,15 +28,15 @@ addQtModule() {
         propagatedBuildInputs+=" $1"
     fi
 
-    if [[ -f "$1/bin/qmake" ]]; then
-        addToSearchPath PATH "$qtOut/bin"
-    fi
-
     if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
         propagatedUserEnvPkgs+=" $1"
     fi
 }
 
+setQMakePath() {
+    export PATH="$qtOut/bin${PATH:+:}$PATH"
+}
+
 qtOut=""
 if [[ -z $qtSubmodule ]]; then
     qtOut="$PWD/qmake-$name"
@@ -56,3 +56,4 @@ Qml2Imports = $qtOut/lib/qt5/qml
 EOF
 
 envHooks+=(addQtModule)
+preConfigurePhases+=" setQMakePath"
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 4db9d8b4665fe..9364b94e355e2 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   installFlags = "INSTALL_ROOT=$(out)";
 
-  buildInputs = [ zlib qt ];
+  buildInputs = [ zlib qt.base ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";