2009-02-10 15:48:30 +00:00
|
|
|
/* This file contains various functions that take a stdenv and return
|
|
|
|
a new stdenv with different behaviour, e.g. using a different C
|
|
|
|
compiler. */
|
|
|
|
|
2014-02-04 15:58:12 +00:00
|
|
|
pkgs:
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-02-10 15:48:30 +00:00
|
|
|
rec {
|
|
|
|
|
|
|
|
|
|
|
|
# Override the compiler in stdenv for specific packages.
|
|
|
|
overrideGCC = stdenv: gcc: stdenv //
|
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args // { NIX_GCC = gcc; });
|
2011-10-19 18:11:26 +01:00
|
|
|
inherit gcc;
|
2009-02-10 15:48:30 +00:00
|
|
|
};
|
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-02-10 15:48:30 +00:00
|
|
|
# Add some arbitrary packages to buildInputs for specific packages.
|
2010-08-06 21:23:35 +01:00
|
|
|
# Used to override packages in stdenv like Make. Should not be used
|
2009-02-10 15:48:30 +00:00
|
|
|
# for other dependencies.
|
|
|
|
overrideInStdenv = stdenv: pkgs: stdenv //
|
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args //
|
2012-12-28 18:35:35 +00:00
|
|
|
{ buildInputs = args.buildInputs or [] ++ pkgs; }
|
2009-02-10 15:48:30 +00:00
|
|
|
);
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
# Override the setup script of stdenv. Useful for testing new
|
|
|
|
# versions of the setup script without causing a rebuild of
|
|
|
|
# everything.
|
|
|
|
#
|
|
|
|
# Example:
|
|
|
|
# randomPkg = import ../bla { ...
|
|
|
|
# stdenv = overrideSetup stdenv ../stdenv/generic/setup-latest.sh;
|
|
|
|
# };
|
|
|
|
overrideSetup = stdenv: setup: stdenv.regenerate setup;
|
|
|
|
|
|
|
|
|
|
|
|
# Return a modified stdenv that uses dietlibc to create small
|
|
|
|
# statically linked binaries.
|
|
|
|
useDietLibC = stdenv: stdenv //
|
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args // {
|
|
|
|
NIX_CFLAGS_LINK = "-static";
|
|
|
|
|
|
|
|
# libcompat.a contains some commonly used functions.
|
|
|
|
NIX_LDFLAGS = "-lcompat";
|
|
|
|
|
|
|
|
# These are added *after* the command-line flags, so we'll
|
|
|
|
# always optimise for size.
|
|
|
|
NIX_CFLAGS_COMPILE =
|
2012-12-28 18:35:35 +00:00
|
|
|
args.NIX_CFLAGS_COMPILE or ""
|
2009-02-10 15:48:30 +00:00
|
|
|
+ " -Os -s -D_BSD_SOURCE=1";
|
|
|
|
|
|
|
|
configureFlags =
|
2012-12-28 18:35:35 +00:00
|
|
|
args.configureFlags or ""
|
2009-02-10 15:48:30 +00:00
|
|
|
+ " --disable-shared"; # brrr...
|
|
|
|
|
|
|
|
NIX_GCC = import ../build-support/gcc-wrapper {
|
|
|
|
inherit stdenv;
|
2014-02-04 15:58:12 +00:00
|
|
|
libc = pkgs.dietlibc;
|
2009-06-22 15:26:14 +01:00
|
|
|
inherit (stdenv.gcc) gcc binutils nativeTools nativePrefix;
|
2009-02-10 15:48:30 +00:00
|
|
|
nativeLibc = false;
|
|
|
|
};
|
|
|
|
});
|
|
|
|
isDietLibC = true;
|
2014-02-04 15:58:12 +00:00
|
|
|
};
|
2009-02-10 15:48:30 +00:00
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-02-10 15:48:30 +00:00
|
|
|
# Return a modified stdenv that uses klibc to create small
|
|
|
|
# statically linked binaries.
|
|
|
|
useKlibc = stdenv: klibc: stdenv //
|
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args // {
|
|
|
|
NIX_CFLAGS_LINK = "-static";
|
|
|
|
|
|
|
|
# These are added *after* the command-line flags, so we'll
|
|
|
|
# always optimise for size.
|
|
|
|
NIX_CFLAGS_COMPILE =
|
2012-12-28 18:35:35 +00:00
|
|
|
args.NIX_CFLAGS_COMPILE or "" + " -Os -s";
|
2009-02-10 15:48:30 +00:00
|
|
|
|
|
|
|
configureFlags =
|
2012-12-28 18:35:35 +00:00
|
|
|
args.configureFlags or "" + " --disable-shared"; # brrr...
|
2009-02-10 15:48:30 +00:00
|
|
|
|
2014-02-04 15:58:12 +00:00
|
|
|
NIX_GCC = pkgs.runCommand "klibc-wrapper" {} ''
|
2012-01-18 20:16:00 +00:00
|
|
|
mkdir -p $out/bin
|
2009-02-10 15:48:30 +00:00
|
|
|
ln -s ${klibc}/bin/klcc $out/bin/gcc
|
|
|
|
ln -s ${klibc}/bin/klcc $out/bin/cc
|
2012-01-18 20:16:00 +00:00
|
|
|
mkdir -p $out/nix-support
|
2009-02-10 15:48:30 +00:00
|
|
|
echo 'PATH=$PATH:${stdenv.gcc.binutils}/bin' > $out/nix-support/setup-hook
|
|
|
|
'';
|
|
|
|
});
|
|
|
|
isKlibc = true;
|
|
|
|
isStatic = true;
|
2014-02-04 15:58:12 +00:00
|
|
|
};
|
2009-02-10 15:48:30 +00:00
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-02-10 15:48:30 +00:00
|
|
|
# Return a modified stdenv that tries to build statically linked
|
|
|
|
# binaries.
|
|
|
|
makeStaticBinaries = stdenv: stdenv //
|
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args // {
|
|
|
|
NIX_CFLAGS_LINK = "-static";
|
|
|
|
configureFlags =
|
2012-12-28 18:35:35 +00:00
|
|
|
toString args.configureFlags or ""
|
2009-02-10 15:48:30 +00:00
|
|
|
+ " --disable-shared"; # brrr...
|
|
|
|
});
|
|
|
|
isStatic = true;
|
2014-02-04 15:58:12 +00:00
|
|
|
};
|
2009-02-10 15:48:30 +00:00
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2011-12-14 14:31:56 +00:00
|
|
|
# Return a modified stdenv that builds static libraries instead of
|
|
|
|
# shared libraries.
|
|
|
|
makeStaticLibraries = stdenv: stdenv //
|
2010-01-21 21:42:17 +00:00
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args // {
|
|
|
|
dontDisableStatic = true;
|
|
|
|
configureFlags =
|
2012-12-28 18:35:35 +00:00
|
|
|
toString args.configureFlags or ""
|
2011-12-14 14:31:56 +00:00
|
|
|
+ " --enable-static --disable-shared";
|
2010-01-21 21:42:17 +00:00
|
|
|
});
|
2014-02-04 15:58:12 +00:00
|
|
|
};
|
2010-01-21 21:42:17 +00:00
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-11-17 21:14:57 +00:00
|
|
|
# Return a modified stdenv that adds a cross compiler to the
|
|
|
|
# builds.
|
I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.
I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.
Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.
So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:
import /etc/nixos/nixpkgs/default.nix
{
crossSystem = {
config = "armv5tel-unknown-linux-gnueabi";
bigEndian = false;
arch = "arm";
float = "soft";
};
}
svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +00:00
|
|
|
makeStdenvCross = stdenv: cross: binutilsCross: gccCross: stdenv //
|
2012-12-28 18:20:09 +00:00
|
|
|
{ mkDerivation = {name ? "", buildInputs ? [], nativeBuildInputs ? [],
|
|
|
|
propagatedBuildInputs ? [], propagatedNativeBuildInputs ? [],
|
|
|
|
selfNativeBuildInput ? false, ...}@args: let
|
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
|
|
|
|
|
|
|
# *BuildInputs exists temporarily as another name for
|
|
|
|
# *HostInputs.
|
|
|
|
|
2010-03-04 14:44:38 +00:00
|
|
|
# In nixpkgs, sometimes 'null' gets in as a buildInputs element,
|
|
|
|
# and we handle that through isAttrs.
|
2012-12-28 18:42:10 +00:00
|
|
|
getNativeDrv = drv: drv.nativeDrv or drv;
|
|
|
|
getCrossDrv = drv: drv.crossDrv or drv;
|
|
|
|
nativeBuildInputsDrvs = map getNativeDrv nativeBuildInputs;
|
|
|
|
buildInputsDrvs = map getCrossDrv buildInputs;
|
|
|
|
buildInputsDrvsAsBuildInputs = map getNativeDrv buildInputs;
|
|
|
|
propagatedBuildInputsDrvs = map getCrossDrv propagatedBuildInputs;
|
|
|
|
propagatedNativeBuildInputsDrvs = map getNativeDrv propagatedNativeBuildInputs;
|
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
|
|
|
|
2012-12-28 18:20:09 +00:00
|
|
|
# The base stdenv already knows that nativeBuildInputs and
|
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
|
|
|
# buildInputs should be built with the usual gcc-wrapper
|
|
|
|
# And the same for propagatedBuildInputs.
|
2012-12-28 18:08:19 +00:00
|
|
|
nativeDrv = stdenv.mkDerivation args;
|
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
|
|
|
|
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
|
|
|
# Temporary expression until the cross_renaming, to handle the
|
|
|
|
# case of pkgconfig given as buildInput, but to be used as
|
2012-12-28 18:20:09 +00:00
|
|
|
# nativeBuildInput.
|
2012-12-28 18:42:10 +00:00
|
|
|
hostAsNativeDrv = drv:
|
2012-12-28 18:37:42 +00:00
|
|
|
builtins.unsafeDiscardStringContext drv.nativeDrv.drvPath
|
|
|
|
== builtins.unsafeDiscardStringContext drv.crossDrv.drvPath;
|
2010-03-04 14:44:38 +00:00
|
|
|
buildInputsNotNull = stdenv.lib.filter
|
2012-12-28 18:08:19 +00:00
|
|
|
(drv: builtins.isAttrs drv && drv ? nativeDrv) buildInputs;
|
2012-12-28 18:42:10 +00:00
|
|
|
nativeInputsFromBuildInputs = stdenv.lib.filter hostAsNativeDrv buildInputsNotNull;
|
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
|
|
|
|
2012-12-28 18:08:19 +00:00
|
|
|
# We should overwrite the input attributes in crossDrv, to overwrite
|
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
|
|
|
# the defaults for only-native builds in the base stdenv
|
2012-12-28 18:37:42 +00:00
|
|
|
crossDrv = if cross == null then nativeDrv else
|
- 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
|
|
|
stdenv.mkDerivation (args // {
|
I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.
I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.
Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.
So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:
import /etc/nixos/nixpkgs/default.nix
{
crossSystem = {
config = "armv5tel-unknown-linux-gnueabi";
bigEndian = false;
arch = "arm";
float = "soft";
};
}
svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +00:00
|
|
|
name = name + "-" + cross.config;
|
2012-12-28 18:20:09 +00:00
|
|
|
nativeBuildInputs = nativeBuildInputsDrvs
|
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
|
|
|
++ nativeInputsFromBuildInputs
|
2009-11-20 16:38:01 +00:00
|
|
|
++ [ gccCross binutilsCross ] ++
|
2012-12-28 18:20:09 +00:00
|
|
|
stdenv.lib.optional selfNativeBuildInput nativeDrv;
|
2009-11-23 23:16:40 +00:00
|
|
|
|
|
|
|
# Cross-linking dynamic libraries, every buildInput should
|
|
|
|
# be propagated because ld needs the -rpath-link to find
|
|
|
|
# any library needed to link the program dynamically at
|
|
|
|
# loader time. ld(1) explains it.
|
|
|
|
buildInputs = [];
|
2012-12-28 18:37:42 +00:00
|
|
|
propagatedBuildInputs = propagatedBuildInputsDrvs ++ buildInputsDrvs;
|
2012-12-28 18:20:09 +00:00
|
|
|
propagatedNativeBuildInputs = propagatedNativeBuildInputsDrvs;
|
I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.
I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.
Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.
So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:
import /etc/nixos/nixpkgs/default.nix
{
crossSystem = {
config = "armv5tel-unknown-linux-gnueabi";
bigEndian = false;
arch = "arm";
float = "soft";
};
}
svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +00:00
|
|
|
|
|
|
|
crossConfig = cross.config;
|
2012-12-28 18:35:35 +00:00
|
|
|
} // args.crossAttrs or {});
|
2012-12-28 18:08:19 +00:00
|
|
|
in nativeDrv // {
|
2012-12-28 18:37:42 +00:00
|
|
|
inherit crossDrv nativeDrv;
|
I made the whole nixpkgs dependencies available to the cross compiler, no
needing to keep a new tree of expressions apart for the expressions to get
cross-compiled.
I changed the whole way of using cross compilation with nixpkgs, which before
was done through a simple adapter.
Now the adapter became complex, and I've tried to avoid the most obvious
recursivities. For example, the fetchurl expression should
never be cross-compiled, as the gmp, mpfr, and some others, like
some ncurses, perl, ... I made overrided copies of those necessary as
perlNoCross, ncursesNoCross, as stdenvNoCross, keeping in mind that
the stdenv (capable of cross compilation) is built upon stdenvNoCross using
an adapter.
So, to cross compile, instead of building using "nixpkgs/default.nix",
you should build with your
own "myarchiteture.nix", which should have contents like these, for example:
import /etc/nixos/nixpkgs/default.nix
{
crossSystem = {
config = "armv5tel-unknown-linux-gnueabi";
bigEndian = false;
arch = "arm";
float = "soft";
};
}
svn path=/nixpkgs/branches/stdenv-updates/; revision=18398
2009-11-17 22:58:48 +00:00
|
|
|
};
|
2010-03-06 21:41:01 +00:00
|
|
|
} // {
|
|
|
|
inherit cross gccCross binutilsCross;
|
|
|
|
};
|
2009-03-30 14:22:19 +01:00
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-03-30 14:22:19 +01:00
|
|
|
/* Modify a stdenv so that the specified attributes are added to
|
|
|
|
every derivation returned by its mkDerivation function.
|
|
|
|
|
|
|
|
Example:
|
|
|
|
stdenvNoOptimise =
|
|
|
|
addAttrsToDerivation
|
|
|
|
{ NIX_CFLAGS_COMPILE = "-O0"; }
|
|
|
|
stdenv;
|
|
|
|
*/
|
|
|
|
addAttrsToDerivation = extraAttrs: stdenv: stdenv //
|
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args // extraAttrs); };
|
|
|
|
|
|
|
|
|
2011-07-01 10:50:34 +01:00
|
|
|
/* Return a modified stdenv that performs the build under $out/.build
|
2009-09-01 22:56:46 +01:00
|
|
|
instead of in $TMPDIR. Thus, the sources are kept available.
|
|
|
|
This is useful for things like debugging or generation of
|
2012-10-31 12:41:54 +00:00
|
|
|
dynamic analysis reports. */
|
2009-09-01 22:56:46 +01:00
|
|
|
keepBuildTree = stdenv:
|
|
|
|
addAttrsToDerivation
|
|
|
|
{ prePhases = "moveBuildDir";
|
|
|
|
|
|
|
|
moveBuildDir =
|
|
|
|
''
|
2012-01-18 20:16:00 +00:00
|
|
|
mkdir -p $out/.build
|
2009-09-01 22:56:46 +01:00
|
|
|
cd $out/.build
|
|
|
|
'';
|
|
|
|
} stdenv;
|
|
|
|
|
|
|
|
|
2009-09-02 07:31:13 +01:00
|
|
|
cleanupBuildTree = stdenv:
|
|
|
|
addAttrsToDerivation
|
|
|
|
{ postPhases = "cleanupBuildDir";
|
|
|
|
|
|
|
|
# Get rid of everything that isn't a gcno file or a C source
|
|
|
|
# file. This also includes the gcda files; we're not
|
|
|
|
# interested in coverage resulting from the package's own test
|
2010-01-04 13:15:04 +00:00
|
|
|
# suite. Also strip the `.tmp_' prefix from gcno files. (The
|
|
|
|
# Linux kernel creates these.)
|
2009-09-02 07:31:13 +01:00
|
|
|
cleanupBuildDir =
|
|
|
|
''
|
|
|
|
find $out/.build/ -type f -a ! \
|
|
|
|
\( -name "*.c" -o -name "*.h" -o -name "*.gcno" \) \
|
|
|
|
| xargs rm -f --
|
2010-01-04 13:15:04 +00:00
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
for i in $(find $out/.build/ -name ".tmp_*.gcno"); do
|
2010-01-04 13:15:04 +00:00
|
|
|
mv "$i" "$(echo $i | sed s/.tmp_//)"
|
|
|
|
done
|
2009-09-02 07:31:13 +01:00
|
|
|
'';
|
2012-10-31 12:41:54 +00:00
|
|
|
} stdenv;
|
|
|
|
|
2009-09-02 07:31:13 +01:00
|
|
|
|
2009-08-28 17:45:56 +01:00
|
|
|
/* Return a modified stdenv that builds packages with GCC's coverage
|
|
|
|
instrumentation. The coverage note files (*.gcno) are stored in
|
2009-09-01 22:56:46 +01:00
|
|
|
$out/.build, along with the source code of the package, to enable
|
|
|
|
programs like lcov to produce pretty-printed reports.
|
2009-08-28 17:45:56 +01:00
|
|
|
*/
|
|
|
|
addCoverageInstrumentation = stdenv:
|
|
|
|
addAttrsToDerivation
|
2010-11-30 14:10:52 +00:00
|
|
|
{
|
2009-08-28 17:45:56 +01:00
|
|
|
postUnpack =
|
|
|
|
''
|
2010-11-30 14:10:52 +00:00
|
|
|
# This is an uberhack to prevent libtool from removing gcno
|
|
|
|
# files. This has been fixed in libtool, but there are
|
|
|
|
# packages out there with old ltmain.sh scripts.
|
|
|
|
# See http://www.mail-archive.com/libtool@gnu.org/msg10725.html
|
2009-08-28 17:45:56 +01:00
|
|
|
for i in $(find -name ltmain.sh); do
|
|
|
|
substituteInPlace $i --replace '*.$objext)' '*.$objext | *.gcno)'
|
|
|
|
done
|
2010-11-30 14:10:52 +00:00
|
|
|
|
|
|
|
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -O0 --coverage"
|
2009-08-28 17:45:56 +01:00
|
|
|
'';
|
|
|
|
}
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-09-01 22:56:46 +01:00
|
|
|
# Object files instrumented with coverage analysis write
|
|
|
|
# runtime coverage data to <path>/<object>.gcda, where <path>
|
|
|
|
# is the location where gcc originally created the object
|
|
|
|
# file. That would be /tmp/nix-build-<something>, which will
|
|
|
|
# be long gone by the time we run the program. Furthermore,
|
|
|
|
# the <object>.gcno files created at compile time are also
|
|
|
|
# written there. And to make nice coverage reports with lcov,
|
|
|
|
# we need the source code. So we have to use the
|
|
|
|
# `keepBuildTree' adapter as well.
|
2009-09-02 07:31:13 +01:00
|
|
|
(cleanupBuildTree (keepBuildTree stdenv));
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-11-16 22:23:11 +00:00
|
|
|
|
|
|
|
/* Replace the meta.maintainers field of a derivation. This is useful
|
|
|
|
when you want to fork to update some packages without disturbing other
|
|
|
|
developers.
|
|
|
|
|
|
|
|
e.g.: in all-packages.nix:
|
|
|
|
|
|
|
|
# remove all maintainers.
|
|
|
|
defaultStdenv = replaceMaintainersField allStdenvs.stdenv pkgs [];
|
|
|
|
*/
|
|
|
|
replaceMaintainersField = stdenv: pkgs: maintainers: stdenv //
|
|
|
|
{ mkDerivation = args:
|
2014-02-04 15:58:12 +00:00
|
|
|
stdenv.lib.recursiveUpdate
|
2009-11-16 22:23:11 +00:00
|
|
|
(stdenv.mkDerivation args)
|
|
|
|
{ meta.maintainers = maintainers; };
|
|
|
|
};
|
2009-11-21 17:50:00 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Use the trace output to report all processed derivations with their
|
|
|
|
license name.
|
|
|
|
*/
|
|
|
|
traceDrvLicenses = stdenv: stdenv //
|
|
|
|
{ mkDerivation = args:
|
|
|
|
let
|
|
|
|
pkg = stdenv.mkDerivation args;
|
|
|
|
printDrvPath = val: let
|
|
|
|
drvPath = builtins.unsafeDiscardStringContext pkg.drvPath;
|
2012-12-28 18:35:35 +00:00
|
|
|
license = pkg.meta.license or null;
|
2009-11-21 17:50:00 +00:00
|
|
|
in
|
2012-12-28 18:35:35 +00:00
|
|
|
builtins.trace "@:drv:${toString drvPath}:${builtins.toString license}:@" val;
|
2009-11-21 17:50:00 +00:00
|
|
|
in pkg // {
|
|
|
|
outPath = printDrvPath pkg.outPath;
|
|
|
|
drvPath = printDrvPath pkg.drvPath;
|
|
|
|
};
|
|
|
|
};
|
2009-11-22 17:04:33 +00:00
|
|
|
|
2012-10-31 12:41:54 +00:00
|
|
|
|
2009-11-22 17:04:33 +00:00
|
|
|
/* Abort if the license predicate is not verified for a derivation
|
|
|
|
declared with mkDerivation.
|
|
|
|
|
|
|
|
One possible predicate to avoid all non-free packages can be achieved
|
|
|
|
with the following function:
|
|
|
|
|
|
|
|
isFree = license: with builtins;
|
|
|
|
if isNull license then true
|
|
|
|
else if isList license then lib.all isFree license
|
|
|
|
else license != "non-free" && license != "unfree";
|
|
|
|
|
|
|
|
This adapter can be defined on the defaultStdenv definition. You can
|
|
|
|
use it by patching the all-packages.nix file or by using the override
|
|
|
|
feature of ~/.nixpkgs/config.nix .
|
|
|
|
*/
|
|
|
|
validateLicenses = licensePred: stdenv: stdenv //
|
|
|
|
{ mkDerivation = args:
|
|
|
|
let
|
|
|
|
pkg = stdenv.mkDerivation args;
|
2011-11-20 20:53:15 +00:00
|
|
|
drv = builtins.unsafeDiscardStringContext pkg.drvPath;
|
2009-11-22 17:04:33 +00:00
|
|
|
license =
|
2012-12-28 18:35:35 +00:00
|
|
|
pkg.meta.license or
|
2011-11-20 20:53:15 +00:00
|
|
|
# Fixed-output derivations such as source tarballs usually
|
|
|
|
# don't have licensing information, but that's OK.
|
2012-12-28 18:35:35 +00:00
|
|
|
(pkg.outputHash or
|
|
|
|
(builtins.trace
|
|
|
|
"warning: ${drv} lacks licensing information" null));
|
2009-11-22 17:04:33 +00:00
|
|
|
|
|
|
|
validate = arg:
|
|
|
|
if licensePred license then arg
|
2011-11-20 20:42:05 +00:00
|
|
|
else abort ''
|
2011-11-20 20:53:15 +00:00
|
|
|
while building ${drv}:
|
2011-11-20 20:42:05 +00:00
|
|
|
license `${builtins.toString license}' does not pass the predicate.
|
|
|
|
'';
|
2009-11-22 17:04:33 +00:00
|
|
|
|
|
|
|
in pkg // {
|
|
|
|
outPath = validate pkg.outPath;
|
|
|
|
drvPath = validate pkg.drvPath;
|
|
|
|
};
|
|
|
|
};
|
2012-10-31 12:41:54 +00:00
|
|
|
|
|
|
|
|
|
|
|
/* Modify a stdenv so that it produces debug builds; that is,
|
|
|
|
binaries have debug info, and compiler optimisations are
|
|
|
|
disabled. */
|
|
|
|
keepDebugInfo = stdenv: stdenv //
|
|
|
|
{ mkDerivation = args: stdenv.mkDerivation (args // {
|
|
|
|
dontStrip = true;
|
|
|
|
NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -g -O0";
|
|
|
|
});
|
|
|
|
};
|
|
|
|
|
2014-02-04 15:58:12 +00:00
|
|
|
|
|
|
|
/* Modify a stdenv so that it used the Gold linker. */
|
|
|
|
useGoldLinker = stdenv:
|
|
|
|
let
|
|
|
|
binutils = stdenv.gcc.binutils;
|
|
|
|
binutils' = pkgs.runCommand "${binutils.name}-gold" { }
|
|
|
|
''
|
|
|
|
mkdir -p $out/bin
|
|
|
|
ln -s ${binutils}/bin/* $out/bin/
|
|
|
|
ln -sfn ${binutils}/bin/ld.gold $out/bin/ld
|
|
|
|
''; # */
|
|
|
|
in overrideGCC stdenv (stdenv.gcc.override { binutils = binutils'; });
|
|
|
|
|
2009-03-30 14:22:19 +01:00
|
|
|
}
|