mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
pkgs/top-level/all-packages.nix: ensure that Python's darwinArchUtility and darwinSwVersUtility parameters can be overridden
svn path=/nixpkgs/trunk/; revision=25749
This commit is contained in:
parent
1891300e11
commit
1877857ea8
@ -2329,8 +2329,8 @@ let
|
|||||||
|
|
||||||
python27Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.7) {
|
python27Base = lowPrio (makeOverridable (import ../development/interpreters/python/2.7) {
|
||||||
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
|
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
|
||||||
arch = if stdenv.isDarwin then darwinArchUtility else null;
|
arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
|
||||||
sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
|
sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
|
||||||
});
|
});
|
||||||
|
|
||||||
python27Full = lowPrio (python27Base.override {
|
python27Full = lowPrio (python27Base.override {
|
||||||
@ -2340,8 +2340,8 @@ let
|
|||||||
|
|
||||||
python3 = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
|
python3 = lowPrio (makeOverridable (import ../development/interpreters/python/3.1) {
|
||||||
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
|
inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
|
||||||
arch = if stdenv.isDarwin then darwinArchUtility else null;
|
arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
|
||||||
sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
|
sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
|
||||||
});
|
});
|
||||||
|
|
||||||
pyrex = pyrex095;
|
pyrex = pyrex095;
|
||||||
|
Loading…
Reference in New Issue
Block a user