diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-12-11 12:47:00 +0000 |
| commit | ee04ffcb550809f7d97d709ff4ec709a21b30ab9 (patch) | |
| tree | 470bdb3f97b0ab18d3abeec3e1f59db7a4af34ed /pkgs/servers/evolution-data-server/default.nix | |
| parent | 3f1a32c266f792290cb08c45ab40f22a43cb13cb (diff) | |
| parent | 97d4a54698a4dea4b57ec4124591d75a740ee44e (diff) | |
| download | nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.gz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.bz2 nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.lz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.xz nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.tar.zst nixlib-ee04ffcb550809f7d97d709ff4ec709a21b30ab9.zip | |
Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
Diffstat (limited to 'pkgs/servers/evolution-data-server/default.nix')
| -rw-r--r-- | pkgs/servers/evolution-data-server/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix index d313da9f2f9c..84c1eee57e58 100644 --- a/pkgs/servers/evolution-data-server/default.nix +++ b/pkgs/servers/evolution-data-server/default.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , db4, krb5, openldap, glib, libxml2, GConf , nss, gtk, libgnome, libsoup, gnome_keyring , gtkdoc, sqlite, libgweather, libical, icu - , dbus_glib, gperf, nspr, gdk_pixbuf ? null + , dbus_glib, gperf, nspr , ...}: builderDefsPackage (a : |