mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 05:00:16 +00:00
* 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
This commit is contained in:
parent
9e92839468
commit
c416926580
|
@ -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;
|
||||
|
|
|
@ -4173,7 +4173,6 @@ let
|
|||
};
|
||||
|
||||
qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
|
||||
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
|
||||
inherit (pkgs.gnome) glib;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue