Author: rob
Date: Mon May 2 07:26:47 2011
New Revision: 27083
URL: https://svn.nixos.org/websvn/nix/?rev=27083&sc=1
Log:
Modified:
hydra-config/gnu/trunk/emacs/release.nix
Modified: hydra-config/gnu/trunk/emacs/release.nix
==============================================================================
--- hydra-config/gnu/trunk/emacs/release.nix Mon May 2 07:25:29 2011
(r27082)
+++ hydra-config/gnu/trunk/emacs/release.nix Mon May 2 07:26:47 2011
(r27083)
@@ -46,13 +46,12 @@
# Return the list of dependencies.
buildInputsFrom = pkgs: with pkgs;
- [ texinfo ncurses pkgconfig
- x11 libpng libjpeg libungif libtiff ]
+ [ texinfo ncurses pkgconfig x11 ]
++ (with xorg; [ libXft libXpm ])
# Optional dependencies that fail to build on non-GNU platforms.
++ (stdenv.lib.optionals stdenv.isLinux
- [ gtkLibs.gtk librsvg dbus gnutls ])
+ [ gtkLibs.gtk librsvg dbus gnutls libpng libjpeg libungif libtiff ])
# Fallback for Darwin.
++ (stdenv.lib.optional stdenv.isDarwin xlibs.libXaw);
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
