Author: urkud
Date: Sat Mar 17 20:57:28 2012
New Revision: 33217
URL: https://nixos.org/websvn/nix/?rev=33217&sc=1
Log:
Add qt4_for_skype
This build disables some optional features. I'm going to pass this to
skype_linux to reduce the size occupied by i686 packages on x86_64 system.
Modified:
nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.8/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.8/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.8/default.nix Sat Mar
17 20:57:24 2012 (r33216)
+++ nixpkgs/trunk/pkgs/development/libraries/qt-4.x/4.8/default.nix Sat Mar
17 20:57:28 2012 (r33217)
@@ -1,11 +1,12 @@
{ stdenv, fetchurl, substituteAll
-, alsaLib, gstreamer, gst_plugins_base
, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
, libXfixes, libXrandr, libSM, freetype, fontconfig
, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig
, libtiff, glib, icu
, mysql, postgresql, sqlite
, perl, coreutils, libXi
+, buildMultimedia ? true, alsaLib, gstreamer, gst_plugins_base
+, buildWebkit ? true
, flashplayerFix ? true, gdk_pixbuf
, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs
}:
@@ -64,24 +65,25 @@
-v -no-separate-debug-info -release -no-fast -confirm-license -opensource
-opengl -xrender -xrandr -xinerama -xcursor -xinput -xfixes -fontconfig
- -qdbus -cups -glib -dbus-linked -openssl-linked
+ -qdbus -${if cups == null then "no-" else ""}cups -glib -dbus-linked
-openssl-linked
- -plugin-sql-mysql -system-sqlite
+ ${if mysql != null then "-plugin" else "-no"}-sql-mysql -system-sqlite
-exceptions -xmlpatterns
-make libs -make tools -make translations
-nomake demos -nomake examples -nomake docs
- -no-phonon -webkit -multimedia -audio-backend
+ -no-phonon ${if buildWebkit then "" else "-no"}-webkit ${if
buildMultimedia then "" else "-no"}-multimedia -audio-backend
'';
propagatedBuildInputs =
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes
libXv libXi libSM mesa
- alsaLib zlib libpng openssl dbus.libs freetype fontconfig glib
- gstreamer gst_plugins_base
- ];
+ ] ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib)
+ ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
+ ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia)
+ [ gstreamer gst_plugins_base ]);
# The following libraries are only used in plugins
buildInputs = [ cups # Qt dlopen's libcups instead of linking to it
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 17 20:57:24
2012 (r33216)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Mar 17 20:57:28
2012 (r33217)
@@ -4540,6 +4540,17 @@
inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
};
+ qt4_for_skype = qt48.override {
+ mysql = null;
+ postgresql = null;
+ libtiff = null;
+ libmng = null;
+ cups = null;
+ flashplayerFix = false;
+ gstreamer = null;
+ gst_plugins_base = null;
+ };
+
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator {
};
quesoglc = callPackage ../development/libraries/quesoglc { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
