Merge pull request #11839 from ttuegel/qt-5.4

Qt infrastructure update
2015-12-20 08:11:52 -06:00
parent 78b876f600 298c4befda
commit 5ff1c58606
115 changed files with 1447 additions and 1685 deletions
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qt5, libarchive, xorg }:
+{ stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
+, qtimageformats, qtwebkit, xorg }:

 stdenv.mkDerivation rec {
  version = "0.1.1";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    xorg.xcbutilkeysyms pkgconfig qt5.base qt5.webkit qt5.imageformats libarchive
+    xorg.xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit libarchive
  ];

  configurePhase = ''