585ba8c27f
- Before this changes, cflags and ldflags for the native and the cross compiler got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are independant now, but enough, I think. - Fixed the generic stdenv expression, which did a big mess on buildInputs and buildNativeInputs. Now it distinguishes when there is a stdenvCross or not. Maybe we should have a single stdenv and forget about the stdenvCross adapter - this could end in a stdenv a bit complex, but simpler than the generic stdenv + adapter. - Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH now works for both the cross and the native compilers, but I think this should work well for most cases I can think of. - I tried to fix the guile expression to cross-biuld; guile is built, but not its manual, so the derivation still fails. Guile requires patching to cross-build, as far as I understnad. - Made the glibcCross build to be done through the usage of a gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it directly. - Trying to make physfs (a neverball dependency) cross build. - Updated the gcc expression to support building a cross compiler without getting derivation variables mixed with those of the stdenvCross. svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
127 lines
4.6 KiB
Nix
127 lines
4.6 KiB
Nix
{ system, name, preHook ? null, postHook ? null, initialPath, gcc, shell
|
|
, param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
|
|
, extraAttrs ? {}
|
|
|
|
, # The `fetchurl' to use for downloading curl and its dependencies
|
|
# (see all-packages.nix).
|
|
fetchurlBoot
|
|
}:
|
|
|
|
let
|
|
|
|
lib = import ../../lib;
|
|
|
|
stdenvGenerator = setupScript: rec {
|
|
|
|
# The stdenv that we are producing.
|
|
result =
|
|
|
|
derivation {
|
|
inherit system name;
|
|
|
|
builder = shell;
|
|
|
|
args = ["-e" ./builder.sh];
|
|
|
|
setup = setupScript;
|
|
|
|
inherit preHook postHook initialPath gcc shell;
|
|
|
|
# TODO: make this more elegant.
|
|
inherit param1 param2 param3 param4 param5;
|
|
|
|
propagatedUserEnvPkgs = [gcc] ++
|
|
lib.filter lib.isDerivation initialPath;
|
|
}
|
|
|
|
// {
|
|
|
|
meta = {
|
|
description = "The default build environment for Unix packages in Nixpkgs";
|
|
};
|
|
|
|
# Add a utility function to produce derivations that use this
|
|
# stdenv and its shell.
|
|
mkDerivation = attrs:
|
|
(derivation (
|
|
(removeAttrs attrs ["meta" "passthru"])
|
|
// (let
|
|
buildInputs = if attrs ? buildInputs then attrs.buildInputs
|
|
else [];
|
|
buildNativeInputs = if attrs ? buildNativeInputs then
|
|
attrs.buildNativeInputs else [];
|
|
propagatedBuildInputs = if attrs ? propagatedBuildInputs then
|
|
attrs.propagatedBuildInputs else [];
|
|
propagatedBuildNativeInputs = if attrs ?
|
|
propagatedBuildNativeInputs then
|
|
attrs.propagatedBuildNativeInputs else [];
|
|
crossConfig = if (attrs ? crossConfig) then attrs.crossConfig else
|
|
null;
|
|
in
|
|
{
|
|
builder = if attrs ? realBuilder then attrs.realBuilder else shell;
|
|
args = if attrs ? args then attrs.args else
|
|
["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)];
|
|
stdenv = result;
|
|
system = result.system;
|
|
|
|
# That build by the cross compiler
|
|
buildInputs = lib.optionals (crossConfig != null) buildInputs;
|
|
propagatedBuildInputs = lib.optionals (crossConfig != null)
|
|
propagatedBuildInputs;
|
|
# That build by the usual native compiler
|
|
buildNativeInputs = buildNativeInputs ++ lib.optionals
|
|
(crossConfig == null) buildInputs;
|
|
propagatedBuildNativeInputs = propagatedBuildNativeInputs ++
|
|
lib.optionals (crossConfig == null) propagatedBuildInputs;
|
|
}))
|
|
)
|
|
# The meta attribute is passed in the resulting attribute set,
|
|
# but it's not part of the actual derivation, i.e., it's not
|
|
# passed to the builder and is not a dependency. But since we
|
|
# include it in the result, it *is* available to nix-env for
|
|
# queries.
|
|
//
|
|
{ meta = if attrs ? meta then attrs.meta else {}; }
|
|
# Pass through extra attributes that are not inputs, but
|
|
# should be made available to Nix expressions using the
|
|
# derivation (e.g., in assertions).
|
|
//
|
|
(if attrs ? passthru then attrs.passthru else {});
|
|
|
|
# Utility flags to test the type of platform.
|
|
isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin";
|
|
isLinux = result.system == "i686-linux"
|
|
|| result.system == "x86_64-linux"
|
|
|| result.system == "powerpc-linux"
|
|
|| result.system == "armv5tel-linux";
|
|
isi686 = result.system == "i686-linux"
|
|
|| result.system == "i686-darwin"
|
|
|| result.system == "i686-freebsd"
|
|
|| result.system == "i686-openbsd"
|
|
|| result.system == "i386-sunos";
|
|
is64bit = result.system == "x86_64-linux";
|
|
|
|
# Utility function: allow stdenv to be easily regenerated with
|
|
# a different setup script. (See all-packages.nix for an
|
|
# example.)
|
|
regenerate = stdenvGenerator;
|
|
|
|
# For convenience, bring in the library functions in lib/ so
|
|
# packages don't have to do that themselves.
|
|
inherit lib;
|
|
|
|
inherit fetchurlBoot;
|
|
|
|
}
|
|
|
|
# Propagate any extra attributes. For instance, we use this to
|
|
# "lift" packages like curl from the final stdenv for Linux to
|
|
# all-packages.nix for that platform (meaning that it has a line
|
|
# like curl = if stdenv ? curl then stdenv.curl else ...).
|
|
// extraAttrs;
|
|
|
|
}.result;
|
|
|
|
|
|
in stdenvGenerator ./setup.sh
|