Author: rob
Date: Thu Apr 28 08:26:00 2011
New Revision: 27026
URL: https://svn.nixos.org/websvn/nix/?rev=27026&sc=1
Log:
emacs/release.nix: darwin needs --with-xpm=no --with-jpeg=no --with-png=no
--with-gif=no --with-tiff=no for plain builds
Modified:
hydra-config/gnu/trunk/emacs/release.nix
Modified: hydra-config/gnu/trunk/emacs/release.nix
==============================================================================
--- hydra-config/gnu/trunk/emacs/release.nix Thu Apr 28 08:23:09 2011
(r27025)
+++ hydra-config/gnu/trunk/emacs/release.nix Thu Apr 28 08:26:00 2011
(r27026)
@@ -76,7 +76,12 @@
build = pkgs: {
buildInputs = with pkgs; [ texinfo ncurses ];
- configureFlags = with pkgs; stdenv.lib.optionalString (stdenv ? glibc)
"--with-crt-dir=${stdenv.glibc}/lib" ;
+ configureFlags =
+ with pkgs;
+ (if stdenv.isDarwin then
+ "--with-xpm=no --with-jpeg=no --with-png=no --with-gif=no
--with-tiff=no"
+ else
+ stdenv.lib.optionalString (stdenv ? glibc)
"--with-crt-dir=${stdenv.glibc}/lib") ;
};
coverage = pkgs: {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
