qt48: minimize default dependencies on non-Linux

This commit is contained in:
Vladimír Čunát 2013-06-18 22:00:20 +02:00
parent 98436616a5
commit 3cba755596
2 changed files with 3 additions and 2 deletions

View file

@ -5,8 +5,8 @@
, libtiff, glib, icu , libtiff, glib, icu
, mysql, postgresql, sqlite , mysql, postgresql, sqlite
, perl, coreutils, libXi , perl, coreutils, libXi
, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base
, buildWebkit ? true , buildWebkit ? stdenv.isLinux
, flashplayerFix ? false, gdk_pixbuf , flashplayerFix ? false, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
, developerBuild ? false , developerBuild ? false

View file

@ -5069,6 +5069,7 @@ let
qt48 = callPackage ../development/libraries/qt-4.x/4.8 { qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
# GNOME dependencies are not used unless gtkStyle == true # GNOME dependencies are not used unless gtkStyle == true
inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
cups = if stdenv.isLinux then cups else null;
}; };
qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { qt48Full = callPackage ../development/libraries/qt-4.x/4.8 {