Author: simons
Date: Fri Oct 29 14:46:40 2010
New Revision: 24530
URL: https://svn.nixos.org/websvn/nix/?rev=24530&sc=1
Log:
mod_wsgi: fixed build on Darwin
The configure script had an hard-coded impure path to the lipo binary. If that
binary was found -- and it was --, then the script decided to pass an invalid
"-arch i386" flag to libtool, which subsequently failed. There is probably
another way to pass that -arch flag, but I didn't look hard because it's
redundant anyway.
Modified:
nixpkgs/trunk/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/apache-modules/mod_wsgi/default.nix Fri Oct
29 14:46:32 2010 (r24529)
+++ nixpkgs/trunk/pkgs/servers/http/apache-modules/mod_wsgi/default.nix Fri Oct
29 14:46:40 2010 (r24530)
@@ -11,7 +11,9 @@
buildInputs = [ apacheHttpd python ];
patchPhase = ''
- sed -r -i "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" configure
+ sed -r -i -e "s|^LIBEXECDIR=.*$|LIBEXECDIR=$out/modules|" \
+ ${if stdenv.isDarwin then "-e 's|/usr/bin/lipo|lipo|'" else ""} \
+ configure
'';
meta = {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
