Author: simons
Date: Wed Feb  2 11:16:31 2011
New Revision: 25749
URL: https://svn.nixos.org/websvn/nix/?rev=25749&sc=1

Log:
pkgs/top-level/all-packages.nix: ensure that Python's darwinArchUtility and 
darwinSwVersUtility parameters can be overridden

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Feb  2 11:16:27 
2011        (r25748)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Wed Feb  2 11:16:31 
2011        (r25749)
@@ -2329,8 +2329,8 @@
 
   python27Base = lowPrio (makeOverridable (import 
../development/interpreters/python/2.7) {
     inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
-    arch = if stdenv.isDarwin then darwinArchUtility else null;
-    sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
+    arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
+    sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
   });
 
   python27Full = lowPrio (python27Base.override {
@@ -2340,8 +2340,8 @@
 
   python3 = lowPrio (makeOverridable (import 
../development/interpreters/python/3.1) {
     inherit (pkgs) fetchurl stdenv zlib bzip2 gdbm;
-    arch = if stdenv.isDarwin then darwinArchUtility else null;
-    sw_vers = if stdenv.isDarwin then darwinSwVersUtility else null;
+    arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
+    sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
   });
 
   pyrex = pyrex095;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to