public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Darwin: Add mig', lipo', etc. to `stdenvNative'.

Browse Source 
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
This commit is contained in:
Ludovic Courtès
2012-04-23 15:47:31 +00:00
parent 0a9d954bc6
commit 04600bbec1
31 changed files with 57 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/python/2.6/default.nix
View File

@@ -1,11 +1,8 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
, darwinArchUtility ? null, darwinSwVersUtility ? null
}:
assert zlibSupport -> zlib != null;
assert stdenv.isDarwin -> darwinArchUtility != null;
assert stdenv.isDarwin -> darwinSwVersUtility != null;
with stdenv.lib;
@@ -33,8 +30,7 @@ let
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[ bzip2 ]
++ optional zlibSupport zlib
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
++ optional zlibSupport zlib;
# Build the basic Python interpreter without modules that have

6
pkgs/development/interpreters/python/2.7/default.nix
View File

@@ -1,11 +1,8 @@
{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2
, sqlite, tcl, tk, x11, openssl, readline, db4, ncurses, gdbm
, darwinArchUtility ? null, darwinSwVersUtility ? null
}:
assert zlibSupport -> zlib != null;
assert stdenv.isDarwin -> darwinArchUtility != null;
assert stdenv.isDarwin -> darwinSwVersUtility != null;
with stdenv.lib;
@@ -39,8 +36,7 @@ let
buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[ bzip2 openssl ]
++ optional zlibSupport zlib
++ optionals stdenv.isDarwin [ darwinArchUtility darwinSwVersUtility ];
++ optional zlibSupport zlib;
ensurePurity =
''

5
pkgs/development/interpreters/python/3.1/default.nix
View File

@@ -9,11 +9,8 @@
, openssl
, tcl, tk
, libX11, xproto
, arch ? null, sw_vers ? null
}:
assert stdenv.isDarwin -> arch != null;
assert stdenv.isDarwin -> sw_vers != null;
assert readline != null -> ncurses != null;
with stdenv.lib;
@@ -23,7 +20,7 @@ let
version = "${majorVersion}.3";
buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers
zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
];
in
stdenv.mkDerivation {

5
pkgs/development/interpreters/python/3.2/default.nix
View File

@@ -9,11 +9,8 @@
, openssl
, tcl, tk
, libX11, xproto
, arch ? null, sw_vers ? null
}:
assert stdenv.isDarwin -> arch != null;
assert stdenv.isDarwin -> sw_vers != null;
assert readline != null -> ncurses != null;
with stdenv.lib;
@@ -23,7 +20,7 @@ let
version = "${majorVersion}";
buildInputs = filter (p: p != null) [
zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto arch sw_vers
zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
];
in
stdenv.mkDerivation {