Phonon: style, +pulseaudio

svn path=/nixpkgs/trunk/; revision=32503

3 files changed, 20 insertions, 23 deletions

diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
index 3b5a201e037..d4fb593ca80 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
@@ -1,19 +1,21 @@
 { stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }:
 
-let version = "4.6.0"; in
+let
+  version = "4.6.0";
+  pname = "phonon-backend-gstreamer";
+in
 
 stdenv.mkDerivation rec {
-  name = "phonon-backend-gstreamer-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
     sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v";
   };
 
-  buildInputs =
-    [ cmake pkgconfig phonon qt4 automoc4 xz
-      gst_all.gstreamer gst_all.gstPluginsBase
-    ];
+  buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ];
+
+  buildNativeInputs = [ cmake automoc4 xz pkgconfig ];
 
   meta = {
     homepage = http://phonon.kde.org/;
diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix
index 30b3482301a..faa88f8854f 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix
@@ -1,20 +1,22 @@
-a@{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }:
+{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }:
 
 let
-  pn = "phonon-backend-vlc";
+  pname = "phonon-backend-vlc";
   v = "0.5.0";
-  vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version
+  vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version
 in
 
 stdenv.mkDerivation {
-  name = "${pn}-${v}";
+  name = "${pname}-${v}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pn}/${v}/src/${pn}-${v}.tar.xz";
-    sha256 = "2256fe9fef74bcd165c24ae8e9b606a48264c9193a4a1da6ef0aaa02dad76388";
+    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2";
   };
 
-  buildInputs = [ xz qt4 vlc cmake automoc4 phonon ];
+  buildNativeInputs = [ cmake automoc4 xz ];
+
+  buildInputs = [ qt4 vlc_ phonon ];
 
   meta = {
     description = "VideoLAN backend for Phonon multimedia framework";
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 3e0c5247ace..440c775adb2 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4, xz }:
+{ stdenv, fetchurl, cmake, automoc4, qt4, xz, pulseaudio }:
 
 let
   v = "4.6.0";
@@ -12,17 +12,10 @@ stdenv.mkDerivation rec {
     sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4";
   };
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ qt4 pulseaudio ];
 
   buildNativeInputs = [ cmake automoc4 xz ];
 
-  cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs";
-  preConfigure =
-    ''
-      substituteInPlace designer/CMakeLists.txt \
-        --replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
-    '';
-
   meta = {
     homepage = http://phonon.kde.org/;
     description = "Multimedia API for Qt";