* Emacs: don't depend on dbus on non-Linux platforms.

svn path=/nixpkgs/branches/x-updates/; revision=26007
This commit is contained in:
Eelco Dolstra 2011-02-17 10:17:49 +00:00
parent 9b6dfe840a
commit a9633d80de

View file

@ -17,10 +17,12 @@ stdenv.mkDerivation rec {
sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z"; sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z";
}; };
buildInputs = [ buildInputs =
ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf libtiff librsvg libXft gconf
]; ]
++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
++ stdenv.lib.optional stdenv.isLinux dbus;
configureFlags = configureFlags =
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ]; stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ];