From c416926580a2260e9cc44dc9920a948c0f406eaa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jul 2011 09:18:38 +0000
Subject: [PATCH] * Qt: remove Phonon since we can just use the external Phonon
   package.  This also removes the GStreamer dependency because only   Phonon
 uses it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27814
---
 pkgs/development/libraries/qt-4.x/4.7/default.nix | 7 ++-----
 pkgs/top-level/all-packages.nix                   | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index e84c57501dc3..67725315aa5a 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, alsaLib, gstreamer, gstPluginsBase, pulseaudio
+, alsaLib, pulseaudio
 , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
 , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
 , zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
       -fontconfig -I${freetype}/include/freetype2
       -exceptions -xmlpatterns
-      -multimedia -audio-backend -phonon -phonon-backend
+      -multimedia -audio-backend -no-phonon
       -webkit -javascript-jit
       -make libs -make tools -make translations
       ${if buildDemos == true then "-make demos" else "-nomake demos"}
@@ -85,8 +85,6 @@ stdenv.mkDerivation rec {
     libXfixes
     glib
     libtiff
-    gstreamer
-    gstPluginsBase
     pulseaudio
   ];
 
@@ -102,7 +100,6 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
-    ln -sv phonon $out/include/Phonon
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a102f36f98e..25219e18ef0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4173,7 +4173,6 @@ let
   };
 
   qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
-    inherit (pkgs.gst_all) gstreamer gstPluginsBase;
     inherit (pkgs.gnome) glib;
   };