Author: viric
Date: Sun Aug 8 17:26:30 2010
New Revision: 23038
URL: https://svn.nixos.org/websvn/nix/?rev=23038&sc=1
Log:
Fix the cross-building of packages mentioned in stdenvLinux.overrides.
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 Sun Aug 8 14:27:43
2010 (r23037)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Aug 8 17:26:30
2010 (r23038)
@@ -93,8 +93,12 @@
# (un-overriden) set of packages, allowing packageOverrides
# attributes to refer to the original attributes (e.g. "foo =
# ... pkgs.foo ...").
+ # We don't want stdenv overrides in the case of cross-building, or
+ # otherwise the basic overrided packages will not be built with the
+ # crossStdenv adapter.
overrides = (getConfig ["packageOverrides"] (pkgs: {})) pkgsOrig //
- (if pkgsOrig.stdenv ? overrides then pkgsOrig.stdenv.overrides else { });
+ (if (pkgsOrig.stdenv ? overrides && crossSystem == null)
+ then pkgsOrig.stdenv.overrides else { });
pkgsOrig = pkgsFun {}; # the un-overriden packages, passed to
packageOverrides
pkgs = pkgsFun overrides; # the overriden, final packages
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
