From 9c1a9c2c4b524d0664564afa05753f27d325e649 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 18 Aug 2010 22:53:42 +0000 Subject: [PATCH] Make qt47 more override-friendly svn path=/nixpkgs/trunk/; revision=23240 --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5934556b910..4e1fc4a54ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3643,13 +3643,11 @@ let }; 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;