Author: eelco
Date: Mon Jul 18 09:18:38 2011
New Revision: 27814
URL: https://svn.nixos.org/websvn/nix/?rev=27814&sc=1
Log:
* Qt: remove Phonon since we can just use the external Phonon
package. This also removes the GStreamer dependency because only
Phonon uses it.
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Mon Jul 18 08:36:01 2011 (r27813)
+++ nixpkgs/branches/kde-4.7/pkgs/development/libraries/qt-4.x/4.7/default.nix
Mon Jul 18 09:18:38 2011 (r27814)
@@ -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 @@
-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 @@
libXfixes
glib
libtiff
- gstreamer
- gstPluginsBase
pulseaudio
];
@@ -102,7 +100,6 @@
postInstall = ''
${if useDocs then "rm -rfv $out/share/doc/${name}/{html,src}" else ""}
- ln -sv phonon $out/include/Phonon
'';
enableParallelBuilding = true;
Modified: nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Mon Jul 18
08:36:01 2011 (r27813)
+++ nixpkgs/branches/kde-4.7/pkgs/top-level/all-packages.nix Mon Jul 18
09:18:38 2011 (r27814)
@@ -4173,7 +4173,6 @@
};
qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
- inherit (pkgs.gst_all) gstreamer gstPluginsBase;
inherit (pkgs.gnome) glib;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
