diff options
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index f8c6dd2a247..b797f631b8e 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -5,8 +5,8 @@ , libtiff, glib, icu , mysql, postgresql, sqlite , perl, coreutils, libXi -, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base -, buildWebkit ? true +, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base +, buildWebkit ? stdenv.isLinux , flashplayerFix ? false, gdk_pixbuf , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , developerBuild ? false diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d56c1ff8af..e7e96565728 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5069,6 +5069,7 @@ let qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + cups = if stdenv.isLinux then cups else null; }; qt48Full = callPackage ../development/libraries/qt-4.x/4.8 { |