Author: ludo
Date: Sat Apr 30 20:59:24 2011
New Revision: 27066
URL: https://svn.nixos.org/websvn/nix/?rev=27066&sc=1
Log:
emacs: Pass `--x-libraries' and `--x-includes' on Darwin.
Modified:
hydra-config/gnu/trunk/emacs/release.nix
Modified: hydra-config/gnu/trunk/emacs/release.nix
==============================================================================
--- hydra-config/gnu/trunk/emacs/release.nix Sat Apr 30 19:42:48 2011
(r27065)
+++ hydra-config/gnu/trunk/emacs/release.nix Sat Apr 30 20:59:24 2011
(r27066)
@@ -1,5 +1,5 @@
/* Continuous integration of GNU with Hydra/Nix.
- Copyright (C) 2010 Ludovic Courtès <l...@gnu.org>
+ Copyright (C) 2011 Ludovic Courtès <l...@gnu.org>
Copyright (C) 2011 Rob Vermaas <rob.verm...@gmail.com>
This program is free software: you can redistribute it and/or modify
@@ -79,7 +79,13 @@
configureFlags =
with pkgs;
(if stdenv.isDarwin then
- "--with-xpm=no --with-jpeg=no --with-png=no --with-gif=no
--with-tiff=no"
+ [ "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
+ "--with-gif=no" "--with-tiff=no"
+
+ # Make sure `configure' doesn't pick /usr/lib.
+ "--x-libraries=${xlibs.libX11}/lib"
+ "--x-includes=${xlibs.libX11}/include"
+ ]
else
stdenv.lib.optionalString (stdenv ? glibc)
"--with-crt-dir=${stdenv.glibc}/lib") ;
};
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
