Author: egorochkin
Date: Sun Nov 28 09:21:36 2010
New Revision: 24897
URL: https://svn.nixos.org/websvn/nix/?rev=24897&sc=1
Log:
ekiga: fix build failure. Patch by Karn Kallio.
Modified:
nixpkgs/trunk/pkgs/applications/networking/ekiga/default.nix
nixpkgs/trunk/pkgs/servers/evolution-data-server/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/ekiga/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/ekiga/default.nix Sun Nov
28 09:17:42 2010 (r24896)
+++ nixpkgs/trunk/pkgs/applications/networking/ekiga/default.nix Sun Nov
28 09:21:36 2010 (r24897)
@@ -3,7 +3,7 @@
, perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi
, libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake
, autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib
- , libXrandr, randrproto, which, libxslt
+ , libXrandr, randrproto, which, libxslt, libtasn1
, ...}:
builderDefsPackage
(a :
Modified: nixpkgs/trunk/pkgs/servers/evolution-data-server/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/evolution-data-server/default.nix Sun Nov
28 09:17:42 2010 (r24896)
+++ nixpkgs/trunk/pkgs/servers/evolution-data-server/default.nix Sun Nov
28 09:21:36 2010 (r24897)
@@ -3,7 +3,7 @@
, 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 :
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 28 09:17:42
2010 (r24896)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 28 09:21:36
2010 (r24897)
@@ -7034,8 +7034,7 @@
dpkg = callPackage ../tools/package-management/dpkg { };
- ekiga = lib.callPackageWith (pkgs // pkgs.xorg // pkgs.gtkLibs // pkgs.gnome)
- ../applications/networking/ekiga {};
+ ekiga = newScope (pkgs.gtkLibs // pkgs.gnome)
../applications/networking/ekiga { };
electricsheep = callPackage ../misc/screensavers/electricsheep { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
