> On Friday 12 November 2010 04:20:55 Karn Kallio wrote:
> > Patch to fix the build of the ekiga Nix expression in Nixpkgs.
> >
> > Hydra error report http://hydra.nixos.org/build/734332
>
> You forgot to attch the patch :)
>
Doh! Patch now attached!
> And why don't you commit your patches yourself, at least the simple ones?
I don't have an SVN account. I will request one.
> You still can post patches you are unsure about for review...
I will certainly do so! Review is good.
> --
> Evgeny
From 27aa3ec1c5def38855a3134b817e4bd09d46a6fb Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkal...@eka.(none)>
Date: Thu, 11 Nov 2010 21:31:22 -0430
Subject: [PATCH] Fix ekiga build failure.
Remove gdk_pixbuf as a dependency of evolution-data-server. gdk_pixbuf
was not building and evolution-data-server does not seem to use it.
---
pkgs/applications/networking/ekiga/default.nix | 2 +-
pkgs/servers/evolution-data-server/default.nix | 2 +-
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 46af227..d411c3b 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 d313da9..84c1eee 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 a13b456..c0ceee2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6954,8 +6954,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 { };
--
1.7.3.2
_______________________________________________
nix-dev mailing list
[email protected]
https://mail.cs.uu.nl/mailman/listinfo/nix-dev
