public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Qt: remove Phonon since we can just use the external Phonon

Browse Source 
package.  This also removes the GStreamer dependency because only
  Phonon uses it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27814
This commit is contained in:
Eelco Dolstra 2011-07-18 09:18:38 +00:00
parent 9e92839468
commit c416926580
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/qt-4.x/4.7/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, alsaLib, gstreamer, gstPluginsBase, pulseaudio , alsaLib, pulseaudio
, libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu , libXft, libXrender, randrproto, xextproto, libXinerama, xineramaproto, libXcursor, libXmu
, libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig , libXv, libXext, libXfixes, inputproto, fixesproto, libXrandr, freetype, fontconfig
, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig, libtiff, glib , 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 -qdbus -cups -glib -xfixes -dbus-linked -openssl-linked
-fontconfig -I${freetype}/include/freetype2 -fontconfig -I${freetype}/include/freetype2
-exceptions -xmlpatterns -exceptions -xmlpatterns
-multimedia -audio-backend -phonon -phonon-backend -multimedia -audio-backend -no-phonon
-webkit -javascript-jit -webkit -javascript-jit
-make libs -make tools -make translations -make libs -make tools -make translations
${if buildDemos == true then "-make demos" else "-nomake demos"} ${if buildDemos == true then "-make demos" else "-nomake demos"}
@ -85,8 +85,6 @@ stdenv.mkDerivation rec {
libXfixes libXfixes
glib glib
libtiff libtiff
gstreamer
gstPluginsBase
pulseaudio pulseaudio
]; ];
@ -102,7 +100,6 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""} ${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
ln -sv phonon $out/include/Phonon
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/all-packages.nix
View File

@ -4173,7 +4173,6 @@ let
}; };
qt47 = callPackage ../development/libraries/qt-4.x/4.7 { qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
inherit (pkgs.gnome) glib; inherit (pkgs.gnome) glib;
}; };