summary refs log tree commit diff
path: root/pkgs/os-specific/darwin
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2009-10-20 12:13:49 +0000
committerPeter Simons <simons@cryp.to>2009-10-20 12:13:49 +0000
commit90dd9d14bf6d3763852bb983270e73e7275cd09f (patch)
tree7069928e6ea391f988b4fc64e16707fb982bca23 /pkgs/os-specific/darwin
parent97166d8a20b4282e3eeebc57a5891a311e1a12a0 (diff)
python-2.6: fixed build on Darwin
 * Dropped "nolongdouble.patch". The patch no longer applies to Python 2.6, and
   apparently isn't required anymore either.

 * Added access to native Darwin arch utility. Python tries to run 'arch' in
   the configure stage, but that binary reside in /usr/bin. To make it
   available to the expression, the small wrapper darwinArchUtility is added as
   a buildInput if appropriate.

 * Don't pass --enable-shared. The build fails if we try to enable building of
   shared libraries, apparently because some required libraries aren't linked,
   i.e. the linker call isn't right.

TODO:

 * Figure out how to enable shared linking.

 * The resulting binary on Darwin seem to lack the binascii module.

svn path=/nixpkgs/trunk/; revision=17894
Diffstat (limited to 'pkgs/os-specific/darwin')
-rwxr-xr-xpkgs/os-specific/darwin/arch/builder.sh3
-rw-r--r--pkgs/os-specific/darwin/arch/default.nix8
2 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/os-specific/darwin/arch/builder.sh b/pkgs/os-specific/darwin/arch/builder.sh
new file mode 100755
index 0000000000000..1fb8be484ba7d
--- /dev/null
+++ b/pkgs/os-specific/darwin/arch/builder.sh
@@ -0,0 +1,3 @@
+source $stdenv/setup
+mkdir -p "$out/bin"
+ln -s /usr/bin/arch "$out/bin/"
diff --git a/pkgs/os-specific/darwin/arch/default.nix b/pkgs/os-specific/darwin/arch/default.nix
new file mode 100644
index 0000000000000..59d00eaf2d1c9
--- /dev/null
+++ b/pkgs/os-specific/darwin/arch/default.nix
@@ -0,0 +1,8 @@
+{stdenv}:
+
+assert stdenv.isDarwin;
+
+stdenv.mkDerivation {
+  name = "darwin-arch-utility";
+  builder = ./builder.sh;
+}