Author: eelco
Date: Thu Feb 17 10:17:49 2011
New Revision: 26007
URL: https://svn.nixos.org/websvn/nix/?rev=26007&sc=1
Log:
* Emacs: don't depend on dbus on non-Linux platforms.
Modified:
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-23/default.nix
Modified:
nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-23/default.nix
==============================================================================
--- nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-23/default.nix
Thu Feb 17 08:23:56 2011 (r26006)
+++ nixpkgs/branches/x-updates/pkgs/applications/editors/emacs-23/default.nix
Thu Feb 17 10:17:49 2011 (r26007)
@@ -17,10 +17,12 @@
sha256 = "1i96hp91s86jawrqjhfxm5y2sjxizv99009128b4bh06bgx6dm7z";
};
- buildInputs = [
- ncurses x11 texinfo libXaw Xaw3d libXpm dbus libpng libjpeg libungif
- libtiff librsvg gtk (if gtk != null then pkgconfig else null) libXft gconf
- ];
+ buildInputs =
+ [ ncurses x11 texinfo libXaw Xaw3d libXpm libpng libjpeg libungif
+ libtiff librsvg libXft gconf
+ ]
+ ++ stdenv.lib.optionals (gtk != null) [ gtk pkgconfig ]
+ ++ stdenv.lib.optional stdenv.isLinux dbus;
configureFlags =
stdenv.lib.optionals (gtk != null) [ "--with-x-toolkit=gtk" "--with-xft" ];
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
