Make qt47 more override-friendly
svn path=/nixpkgs/trunk/; revision=23240
This commit is contained in:
parent
59e4742a6a
commit
9c1a9c2c4b
@ -3643,13 +3643,11 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
|
qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
|
||||||
inherit (gst_all) gstreamer gstPluginsBase;
|
inherit (pkgs.gst_all) gstreamer gstPluginsBase;
|
||||||
inherit (gnome) glib;
|
inherit (pkgs.gnome) glib;
|
||||||
};
|
};
|
||||||
|
|
||||||
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator {
|
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
|
||||||
qt4 = qt46;
|
|
||||||
};
|
|
||||||
|
|
||||||
quassel = callPackage ../applications/networking/irc/quassel {
|
quassel = callPackage ../applications/networking/irc/quassel {
|
||||||
inherit (kde4) qt4 kdelibs phonon automoc4;
|
inherit (kde4) qt4 kdelibs phonon automoc4;
|
||||||
|
Loading…
Reference in New Issue
Block a user