diff options
| author | Evgeny Egorochkin <phreedom.stdin@gmail.com> | 2010-11-28 09:21:36 +0000 |
|---|---|---|
| committer | Evgeny Egorochkin <phreedom.stdin@gmail.com> | 2010-11-28 09:21:36 +0000 |
| commit | 5e994b9153f07e08f462de9f253a0ceb6ad1d84e (patch) | |
| tree | 947831beda41075093c34985926e727cbbb2c054 /pkgs | |
| parent | db4b283fd170a889c6e169db1ed0542bebe272ad (diff) | |
| download | nixpkgs-5e994b9153f07e08f462de9f253a0ceb6ad1d84e.tar nixpkgs-5e994b9153f07e08f462de9f253a0ceb6ad1d84e.tar.gz nixpkgs-5e994b9153f07e08f462de9f253a0ceb6ad1d84e.tar.bz2 nixpkgs-5e994b9153f07e08f462de9f253a0ceb6ad1d84e.tar.lz nixpkgs-5e994b9153f07e08f462de9f253a0ceb6ad1d84e.tar.xz nixpkgs-5e994b9153f07e08f462de9f253a0ceb6ad1d84e.tar.zst nixpkgs-5e994b9153f07e08f462de9f253a0ceb6ad1d84e.zip | |
ekiga: fix build failure. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=24897
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/ekiga/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/evolution-data-server/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/networking/ekiga/default.nix b/pkgs/applications/networking/ekiga/default.nix index 46af2275c37..d411c3b0f57 100644 --- a/pkgs/applications/networking/ekiga/default.nix +++ b/pkgs/applications/networking/ekiga/default.nix @@ -3,7 +3,7 @@ x@{builderDefsPackage , 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 : diff --git a/pkgs/servers/evolution-data-server/default.nix b/pkgs/servers/evolution-data-server/default.nix index d313da9f2f9..84c1eee57e5 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 : diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe38c3e263c..cab56d41736 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7034,8 +7034,7 @@ let 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 { }; |