Author: ludo
Date: Sun May 1 10:25:30 2011
New Revision: 27072
URL: https://svn.nixos.org/websvn/nix/?rev=27072&sc=1
Log:
emacs: Remove dependency on `librsvg' on non-GNU platforms.
Modified:
hydra-config/gnu/trunk/emacs/release.nix
Modified: hydra-config/gnu/trunk/emacs/release.nix
==============================================================================
--- hydra-config/gnu/trunk/emacs/release.nix Sun May 1 10:24:41 2011
(r27071)
+++ hydra-config/gnu/trunk/emacs/release.nix Sun May 1 10:25:30 2011
(r27072)
@@ -47,12 +47,12 @@
# Return the list of dependencies.
buildInputsFrom = pkgs: with pkgs;
[ texinfo ncurses pkgconfig
- x11 libpng libjpeg libungif
- libtiff librsvg ]
+ x11 libpng libjpeg libungif libtiff ]
++ (with xorg; [ libXft libXpm ])
# Optional dependencies that fail to build on non-GNU platforms.
- ++ (stdenv.lib.optionals stdenv.isLinux [ gtkLibs.gtk dbus gnutls ])
+ ++ (stdenv.lib.optionals stdenv.isLinux
+ [ gtkLibs.gtk librsvg dbus gnutls ])
# 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
