From 160b00c8b49abb629c522ad68a5b1bc97bcbeae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 23 Feb 2009 16:06:59 +0000
Subject: [PATCH] GNU Emacs 23.x: D-Bus support.

svn path=/nixpkgs/trunk/; revision=14207
---
 pkgs/applications/editors/emacs-unicode/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                     | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-unicode/default.nix b/pkgs/applications/editors/emacs-unicode/default.nix
index 413828272c4..84a9cae816e 100644
--- a/pkgs/applications/editors/emacs-unicode/default.nix
+++ b/pkgs/applications/editors/emacs-unicode/default.nix
@@ -1,16 +1,18 @@
 { xawSupport ? true
 , xpmSupport ? true
+, dbusSupport ? true
 , xaw3dSupport ? false
 , gtkGUI ? false
 , xftSupport ? false
 , stdenv, fetchcvs, ncurses, x11, libXaw ? null, libXpm ? null, Xaw3d ? null
-, pkgconfig ? null, gtk ? null, libXft ? null
+, pkgconfig ? null, gtk ? null, libXft ? null, dbus ? null
 , libpng, libjpeg, libungif, libtiff, texinfo
 , autoconf, automake
 }:
 
 assert xawSupport -> libXaw != null;
 assert xpmSupport -> libXpm != null;
+assert dbusSupport -> dbus != null;
 assert xaw3dSupport -> Xaw3d != null;
 assert gtkGUI -> pkgconfig != null && gtk != null;
 assert xftSupport -> libXft != null && libpng != null; # libpng = probably a bug
@@ -35,6 +37,7 @@ stdenv.mkDerivation {
     ncurses x11 texinfo
     (if xawSupport then libXaw else null)
     (if xpmSupport then libXpm else null)
+    (if dbusSupport then dbus else null)
     (if xaw3dSupport then Xaw3d else null)
     libpng libjpeg libungif libtiff # maybe not strictly required?
   ]
@@ -46,7 +49,7 @@ stdenv.mkDerivation {
   ";
 
   meta = {
-    description = "Emacs with Unicode, GTK and Xft support (23.x alpha)";
+    description = "GNU Emacs with Unicode, GTK and Xft support (23.x alpha)";
     homepage = http://www.emacswiki.org/cgi-bin/wiki/XftGnuEmacs;
     license = "GPLv3+";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9864b024f9d..80e354b90a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7824,7 +7824,7 @@ let
 
   emacsUnicode = lowPrio (import ../applications/editors/emacs-unicode {
     inherit fetchcvs stdenv ncurses pkgconfig x11 Xaw3d
-      libpng libjpeg libungif libtiff texinfo
+      libpng libjpeg libungif libtiff texinfo dbus
       autoconf automake;
     inherit (xlibs) libXaw libXpm libXft;
     inherit (gtkLibs) gtk;
@@ -7832,6 +7832,7 @@ let
     xaw3dSupport = getPkgConfig "emacs" "xaw3dSupport" false;
     gtkGUI = getPkgConfig "emacs" "gtkSupport" true;
     xftSupport = getPkgConfig "emacs" "xftSupport" true;
+    dbusSupport = getPkgConfig "emacs" "dbusSupport" true;
   });
 
   emms = import ../applications/editors/emacs-modes/emms {