dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

More testing allows fixing more errors from the recent commits.

Browse Source 
svn path=/nixpkgs/trunk/; revision=20279
This commit is contained in:
Lluís Batlle i Rossell 2010-02-27 21:21:20 +00:00
parent 4677180b0d
commit 305a7a2ddf
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/kernel-headers/2.6.32.nix
View File

@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux;
let let
version = "2.6.32.9"; version = "2.6.32.9";
kernelHeadersBaseConfig = if (cross != null) then kernelHeadersBaseConfig = if (cross == null) then
stdenv.platform.kernelHeadersBaseConfig stdenv.platform.kernelHeadersBaseConfig
else else
cross.platform.kernelHeadersBaseConfig; cross.platform.kernelHeadersBaseConfig;

3
pkgs/top-level/all-packages.nix
View File

@ -1967,7 +1967,7 @@ let
enableMultilib = false; enableMultilib = false;
# cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug. # cross-building for ultrasparc in 4.4.3 will require disabling shared due to a gcc bug.
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818 # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818
enableShared = if (crossSystem.platform.arch == "sparc64") then false else true; enableShared = if (crossSystem.arch == "sparc64") then false else true;
crossStageStatic = false; crossStageStatic = false;
}; };
@ -5844,7 +5844,6 @@ let
linuxHeadersCross = cross : forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix { linuxHeadersCross = cross : forceBuildDrv (import ../os-specific/linux/kernel-headers/2.6.32.nix {
inherit stdenv fetchurl cross perl; inherit stdenv fetchurl cross perl;
platform = cross.platform;
}); });
linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix { linuxHeaders_2_6_18 = import ../os-specific/linux/kernel-headers/2.6.18.5.nix {