qt5: make qt-5.4.1 default

2015-03-24 17:14:56 -05:00
parent ad49ea230a
commit 5d1f6ad57c
31 changed files with 73 additions and 75 deletions
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
  buildInputs =
    [ cmake ]
    ++ stdenv.lib.optional withQt4 qt4
-    ++ stdenv.lib.optional withQt5 qt5
+    ++ stdenv.lib.optionals withQt5 (with qt5; [ base svg tools ])
    ++ stdenv.lib.optional withKDE4 kde4.kdelibs
    ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
    ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]