2009-02-01 21:28:55 +00:00
|
|
|
{ system, name, preHook ? null, postHook ? null, initialPath, gcc, shell
|
2004-07-02 11:05:53 +01:00
|
|
|
, param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
|
2006-02-09 17:04:18 +00:00
|
|
|
, extraAttrs ? {}
|
2009-02-02 15:03:38 +00:00
|
|
|
|
|
|
|
, # The `fetchurl' to use for downloading curl and its dependencies
|
|
|
|
# (see all-packages.nix).
|
|
|
|
fetchurlBoot
|
2004-07-02 11:05:53 +01:00
|
|
|
}:
|
|
|
|
|
2009-04-25 15:08:29 +01:00
|
|
|
let
|
|
|
|
|
|
|
|
lib = import ../../lib;
|
2004-07-02 11:05:53 +01:00
|
|
|
|
2006-08-07 14:31:18 +01:00
|
|
|
stdenvGenerator = setupScript: rec {
|
2004-07-02 11:05:53 +01:00
|
|
|
|
2006-08-07 14:31:18 +01:00
|
|
|
# The stdenv that we are producing.
|
|
|
|
result =
|
2004-07-02 11:05:53 +01:00
|
|
|
|
2009-02-01 21:28:55 +00:00
|
|
|
derivation {
|
2009-11-16 23:21:13 +00:00
|
|
|
inherit system name;
|
2004-07-02 11:05:53 +01:00
|
|
|
|
2009-02-01 21:28:55 +00:00
|
|
|
builder = shell;
|
|
|
|
|
|
|
|
args = ["-e" ./builder.sh];
|
2005-02-22 14:32:56 +00:00
|
|
|
|
2006-08-07 14:31:18 +01:00
|
|
|
setup = setupScript;
|
2004-07-02 11:05:53 +01:00
|
|
|
|
2006-08-07 14:31:18 +01:00
|
|
|
inherit preHook postHook initialPath gcc shell;
|
2004-07-02 11:05:53 +01:00
|
|
|
|
2006-08-07 14:31:18 +01:00
|
|
|
# TODO: make this more elegant.
|
|
|
|
inherit param1 param2 param3 param4 param5;
|
2009-04-25 15:08:29 +01:00
|
|
|
|
|
|
|
propagatedUserEnvPkgs = [gcc] ++
|
|
|
|
lib.filter lib.isDerivation initialPath;
|
2006-08-07 14:31:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// {
|
2009-03-25 18:34:27 +00:00
|
|
|
|
|
|
|
meta = {
|
|
|
|
description = "The default build environment for Unix packages in Nixpkgs";
|
|
|
|
};
|
2006-02-09 17:04:18 +00:00
|
|
|
|
2006-08-07 14:31:18 +01:00
|
|
|
# Add a utility function to produce derivations that use this
|
|
|
|
# stdenv and its shell.
|
|
|
|
mkDerivation = attrs:
|
|
|
|
(derivation (
|
2010-02-27 17:35:42 +00:00
|
|
|
(removeAttrs attrs ["meta" "passthru" "crossAttrs"])
|
- Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
keep this branch properly updated from trunk. We agreed with Nicolas Pierron
doing a massive renaming, so all current buildInputs become hostInputs (input
as build for the host machine, in autotools terminology) , and
then buildInputs would mean "input as for the build machine".
By now, the specific "input as for the build machine" is specified through
buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
we start changing nixpkgs expressions so they distinguish the current
buildInputs into buildInputs and buildNativeInputs, we could break even more
nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
to be run in the build machine. This allows, without any special rewriting,
"fetchurl" derivations to be always results for the build machine to use
them.
- The change above implies that, for anyone wanting to cross-compile, has to
build the hostDrv of the wanted derivation. For example, after this commit,
the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
the contents of this arm.nix in r18398.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
2009-11-19 19:03:34 +00:00
|
|
|
// (let
|
|
|
|
buildInputs = if attrs ? buildInputs then attrs.buildInputs
|
|
|
|
else [];
|
Attention, people who care on the builders for native builds. In the stdenv
derivation, the "buildInputs" in every stdenv mkDerivation don't map now
directly to the environment
variable "buildInputs" in the builder, but "buildNativeInputs". So, the inputs
build by the native compiler.
When cross compiling, they will map to the environment variable "buildInputs"
(yes, now the same name), which means does to be built with the cross compiler.
I think I improved the naming of variables a bit. There was a big mess,
specially in the stdenv adapter for cross building, and also in the default
builder script.
I also tried to add proper manager of propagatedInputBuilds, these being
propagated considering the host or build origin of that input build (so, at the
end, being those propagatedInputBuilds being propagated properly to the native
or the cross compiler.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18477
2009-11-19 23:05:11 +00:00
|
|
|
buildNativeInputs = if attrs ? buildNativeInputs then
|
|
|
|
attrs.buildNativeInputs else [];
|
|
|
|
propagatedBuildInputs = if attrs ? propagatedBuildInputs then
|
|
|
|
attrs.propagatedBuildInputs else [];
|
|
|
|
propagatedBuildNativeInputs = if attrs ?
|
|
|
|
propagatedBuildNativeInputs then
|
|
|
|
attrs.propagatedBuildNativeInputs else [];
|
Big fixes in the cross build:
- 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
2009-11-22 19:51:45 +00:00
|
|
|
crossConfig = if (attrs ? crossConfig) then attrs.crossConfig else
|
|
|
|
null;
|
- Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
keep this branch properly updated from trunk. We agreed with Nicolas Pierron
doing a massive renaming, so all current buildInputs become hostInputs (input
as build for the host machine, in autotools terminology) , and
then buildInputs would mean "input as for the build machine".
By now, the specific "input as for the build machine" is specified through
buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
we start changing nixpkgs expressions so they distinguish the current
buildInputs into buildInputs and buildNativeInputs, we could break even more
nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
to be run in the build machine. This allows, without any special rewriting,
"fetchurl" derivations to be always results for the build machine to use
them.
- The change above implies that, for anyone wanting to cross-compile, has to
build the hostDrv of the wanted derivation. For example, after this commit,
the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
the contents of this arm.nix in r18398.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
2009-11-19 19:03:34 +00:00
|
|
|
in
|
2006-08-07 14:31:18 +01:00
|
|
|
{
|
|
|
|
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;
|
Attention, people who care on the builders for native builds. In the stdenv
derivation, the "buildInputs" in every stdenv mkDerivation don't map now
directly to the environment
variable "buildInputs" in the builder, but "buildNativeInputs". So, the inputs
build by the native compiler.
When cross compiling, they will map to the environment variable "buildInputs"
(yes, now the same name), which means does to be built with the cross compiler.
I think I improved the naming of variables a bit. There was a big mess,
specially in the stdenv adapter for cross building, and also in the default
builder script.
I also tried to add proper manager of propagatedInputBuilds, these being
propagated considering the host or build origin of that input build (so, at the
end, being those propagatedInputBuilds being propagated properly to the native
or the cross compiler.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18477
2009-11-19 23:05:11 +00:00
|
|
|
|
|
|
|
# That build by the cross compiler
|
Big fixes in the cross build:
- 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
2009-11-22 19:51:45 +00:00
|
|
|
buildInputs = lib.optionals (crossConfig != null) buildInputs;
|
|
|
|
propagatedBuildInputs = lib.optionals (crossConfig != null)
|
|
|
|
propagatedBuildInputs;
|
Attention, people who care on the builders for native builds. In the stdenv
derivation, the "buildInputs" in every stdenv mkDerivation don't map now
directly to the environment
variable "buildInputs" in the builder, but "buildNativeInputs". So, the inputs
build by the native compiler.
When cross compiling, they will map to the environment variable "buildInputs"
(yes, now the same name), which means does to be built with the cross compiler.
I think I improved the naming of variables a bit. There was a big mess,
specially in the stdenv adapter for cross building, and also in the default
builder script.
I also tried to add proper manager of propagatedInputBuilds, these being
propagated considering the host or build origin of that input build (so, at the
end, being those propagatedInputBuilds being propagated properly to the native
or the cross compiler.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18477
2009-11-19 23:05:11 +00:00
|
|
|
# That build by the usual native compiler
|
Big fixes in the cross build:
- 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
2009-11-22 19:51:45 +00:00
|
|
|
buildNativeInputs = buildNativeInputs ++ lib.optionals
|
|
|
|
(crossConfig == null) buildInputs;
|
|
|
|
propagatedBuildNativeInputs = propagatedBuildNativeInputs ++
|
|
|
|
lib.optionals (crossConfig == null) propagatedBuildInputs;
|
- Removed all *NoCross expressions I dupilcated in nixpkgs, while maintaining
the cross compilation functionality.
- I renamed some expected stdenv.mkDerivation parameter attributes so we can
keep this branch properly updated from trunk. We agreed with Nicolas Pierron
doing a massive renaming, so all current buildInputs become hostInputs (input
as build for the host machine, in autotools terminology) , and
then buildInputs would mean "input as for the build machine".
By now, the specific "input as for the build machine" is specified through
buildNativeInputs. We should fix this in the merge to trunk.
- I made the generic stdenv understand the buildNativeInputs, otherwise if
we start changing nixpkgs expressions so they distinguish the current
buildInputs into buildInputs and buildNativeInputs, we could break even more
nixpkgs for other platforms.
- I changed the default result of mkDerivation so it becomes the derivation for
to be run in the build machine. This allows, without any special rewriting,
"fetchurl" derivations to be always results for the build machine to use
them.
- The change above implies that, for anyone wanting to cross-compile, has to
build the hostDrv of the wanted derivation. For example, after this commit,
the usual test of "nix-build -A bison.hostDrv arm.nix" works. I described
the contents of this arm.nix in r18398.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18471
2009-11-19 19:03:34 +00:00
|
|
|
}))
|
2006-08-07 14:31:18 +01:00
|
|
|
)
|
|
|
|
# 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.
|
2006-09-14 14:30:47 +01:00
|
|
|
//
|
|
|
|
{ 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 {});
|
2006-08-07 14:31:18 +01:00
|
|
|
|
2007-05-20 21:25:06 +01:00
|
|
|
# Utility flags to test the type of platform.
|
2009-11-26 15:30:56 +00:00
|
|
|
isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin" || result.system == "x86_64-darwin";
|
2006-10-23 18:43:03 +01:00
|
|
|
isLinux = result.system == "i686-linux"
|
|
|
|
|| result.system == "x86_64-linux"
|
2009-11-08 00:32:12 +00:00
|
|
|
|| result.system == "powerpc-linux"
|
|
|
|
|| result.system == "armv5tel-linux";
|
2007-05-20 21:25:06 +01:00
|
|
|
isi686 = result.system == "i686-linux"
|
|
|
|
|| result.system == "i686-darwin"
|
2009-09-23 14:30:04 +01:00
|
|
|
|| result.system == "i686-freebsd"
|
2009-09-30 16:19:25 +01:00
|
|
|
|| result.system == "i686-openbsd"
|
|
|
|
|| result.system == "i386-sunos";
|
2009-11-26 15:30:56 +00:00
|
|
|
is64bit = result.system == "x86_64-linux"
|
|
|
|
|| result.system == "x86_64-darwin";
|
2006-08-07 14:31:18 +01:00
|
|
|
|
|
|
|
# Utility function: allow stdenv to be easily regenerated with
|
|
|
|
# a different setup script. (See all-packages.nix for an
|
|
|
|
# example.)
|
|
|
|
regenerate = stdenvGenerator;
|
|
|
|
|
2007-05-24 14:32:18 +01:00
|
|
|
# For convenience, bring in the library functions in lib/ so
|
|
|
|
# packages don't have to do that themselves.
|
2009-04-25 15:08:29 +01:00
|
|
|
inherit lib;
|
2007-05-24 14:32:18 +01:00
|
|
|
|
2008-05-27 08:49:55 +01:00
|
|
|
inherit fetchurlBoot;
|
|
|
|
|
2006-08-07 14:31:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
# 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 ...).
|
2009-02-02 15:03:38 +00:00
|
|
|
// extraAttrs;
|
2006-08-07 14:31:18 +01:00
|
|
|
|
|
|
|
}.result;
|
|
|
|
|
|
|
|
|
2009-04-25 15:08:29 +01:00
|
|
|
in stdenvGenerator ./setup.sh
|