phonon: build with Qt 5.5

5 files changed, 78 insertions, 12 deletions

diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
index bc34d249b46d0..2c6e40eaf7337 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }:
+{ stdenv, fetchurl, cmake, gst_all_1, phonon, pkgconfig, qtbase, debug ? false }:
 
 with stdenv.lib;
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
   };
 
-  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ];
+  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
new file mode 100644
index 0000000000000..bc34d249b46d0
--- /dev/null
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }:
+
+with stdenv.lib;
+
+let
+  version = "4.8.2";
+  pname = "phonon-backend-gstreamer";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
+  };
+
+  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+    "-DPHONON_BUILD_PHONON4QT5=ON"
+  ]
+  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  meta = with stdenv.lib; {
+    homepage = http://phonon.kde.org/;
+    description = "GStreamer backend for Phonon";
+    platforms = platforms.linux;
+    maintainer = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
index b7e4dc7c2b0d8..744d681a6949a 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
@@ -1,16 +1,10 @@
-{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon_qt5, qt5 }:
+{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon, qtbase }:
 
 with stdenv.lib;
 
 let
   pname = "phonon-backend-vlc";
   v = "0.8.2";
-  # Force same Qt version in phonon and VLC
-  vlc_ = vlc.override {
-    inherit qt5;
-    qt4 = null;
-    withQt5 = true;
-  };
 in
 
 stdenv.mkDerivation {
@@ -23,7 +17,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake pkgconfig xz ];
 
-  buildInputs = [ vlc_ phonon_qt5 qt5.base ];
+  buildInputs = [ vlc phonon qtbase ];
 
   cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
 
diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix
index 3dddd60b59f82..fc07344d2d1a1 100644
--- a/pkgs/development/libraries/phonon/qt5/default.nix
+++ b/pkgs/development/libraries/phonon/qt5/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }:
+{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
+, qtbase, qtquick1, qttools
+, debug ? false }:
 
 with stdenv.lib;
 
@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
   };
 
-  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ];
+  buildInputs = [ mesa qtbase qtquick1 qttools libpulseaudio ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
diff --git a/pkgs/development/libraries/phonon/qt5/old.nix b/pkgs/development/libraries/phonon/qt5/old.nix
new file mode 100644
index 0000000000000..3dddd60b59f82
--- /dev/null
+++ b/pkgs/development/libraries/phonon/qt5/old.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio, qt5, debug ? false }:
+
+with stdenv.lib;
+
+let
+  v = "4.8.3";
+in
+
+stdenv.mkDerivation rec {
+  name = "phonon-${v}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz";
+    sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
+  };
+
+  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools libpulseaudio ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}"
+    "-DPHONON_BUILD_PHONON4QT5=ON"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ];
+
+  meta = {
+    homepage = http://phonon.kde.org/;
+    description = "Multimedia API for Qt";
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+  };
+}