alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix the cross-building of packages mentioned in stdenvLinux.overrides.

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=23043
This commit is contained in:
Lluís Batlle i Rossell 2010-08-08 18:52:21 +00:00
parent 4137ceaf80
commit d75e47a383
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/top-level/all-packages.nix
View file

@ -93,8 +93,12 @@ let
# (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