Author: urkud
Date: Wed Aug 18 22:53:42 2010
New Revision: 23240
URL: https://svn.nixos.org/websvn/nix/?rev=23240&sc=1
Log:
Make qt47 more override-friendly
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 18 22:52:59
2010 (r23239)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Aug 18 22:53:42
2010 (r23240)
@@ -3643,13 +3643,11 @@
};
qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
- inherit (gst_all) gstreamer gstPluginsBase;
- inherit (gnome) glib;
+ inherit (pkgs.gst_all) gstreamer gstPluginsBase;
+ inherit (pkgs.gnome) glib;
};
- qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator {
- qt4 = qt46;
- };
+ qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator {
};
quassel = callPackage ../applications/networking/irc/quassel {
inherit (kde4) qt4 kdelibs phonon automoc4;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
