3 files changed, 46 insertions, 6 deletions
diff --git a/pkgs/development/libraries/phonon/qt4/default.nix b/pkgs/development/libraries/phonon/qt4/default.nix
index a127c063ffb..9875b216e06 100644
--- a/pkgs/development/libraries/phonon/qt4/default.nix
+++ b/pkgs/development/libraries/phonon/qt4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt4 }:
+{ stdenv, fetchurl, cmake, automoc4, libpulseaudio, qt4 }:
 
 with stdenv.lib;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
   };
 
-  buildInputs = [ qt4 pulseaudio ];
+  buildInputs = [ qt4 libpulseaudio ];
 
   nativeBuildInputs = [ cmake automoc4 ];
 
diff --git a/pkgs/development/libraries/phonon/qt5/default.nix b/pkgs/development/libraries/phonon/qt5/default.nix
index 248e0427709..fc07344d2d1 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, pulseaudio, qt5, debug ? false }:
+{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
+, qtbase, qtquick1, qttools
+, debug ? false }:
 
 with stdenv.lib;
 
@@ -14,15 +16,17 @@ stdenv.mkDerivation rec {
     sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
   };
 
-  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ];
+  buildInputs = [ mesa qtbase qtquick1 qttools 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"
-  ]
-  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
+  ];
 
   meta = {
     homepage = http://phonon.kde.org/;
diff --git a/pkgs/development/libraries/phonon/qt5/old.nix b/pkgs/development/libraries/phonon/qt5/old.nix
new file mode 100644
index 00000000000..3dddd60b59f
--- /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 ];
+  };
+}