philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs/stdenv/nix-linux/default.nix

21 lines
427 B
Nix
Raw Normal View History

* Re-enabled purity checking: it should work now. First we only checked whether absolute paths passed to gcc/ld refer to the store, which is wrong: they can also refer to the build tree (/tmp/nix-...). * Less static composition in the construction of stdenv-nix-linux: gcc-wrapper and generic are now passed in as arguments, rather then referenced by relative path. This makes it easier to hack on a specific stage of the bootstrap process (before, a change to, e.g., generic/setup.sh would cause all bootstrap stages to be redone). svn path=/nixpkgs/trunk/; revision=833
2004-03-12 12:12:18 +01:00
{stdenv, glibc, pkgs, genericStdenv, gccWrapper}:
* stdenv-nix-linux should more-or-less work again now. svn path=/nixpkgs/trunk/; revision=826
2004-03-09 18:16:02 +01:00
* Remove trivial builders. * Make builders unexecutable by removing the hash-bang line and execute permission. * Convert calls to `derivation' to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to `mkDerivation'. These transformations were all done automatically, so it is quite possible I broke stuff. * Put the `mkDerivation' function in stdenv/generic. svn path=/nixpkgs/trunk/; revision=874
2004-03-29 19:23:01 +02:00
genericStdenv {
name = "stdenv-nix-linux";
preHook = ./prehook.sh;
initialPath = (import ../nix/path.nix) {pkgs = pkgs;};
* It is now possible to execute a builder using a shell inside the Nix store, rather than outside (such as /bin/sh). For instance, the Nix expression for the ATerm library now looks like this: {stdenv, fetchurl}: stdenv.mkDerivation { name = "aterm-2.0.5"; builder = ./builder.sh; ... } where `mkDerivation' is a helper function in `stdenv' that massages the given attribute set into using the bash shell that is part of the standard environment: mkDerivation = attrs: derivation (att s // { builder = pkgs.bash ~ /bin/sh; args = ["-e" attrs.builder]; stdenv = (...); system = (...).system; }); Note that this makes it unnecessary to set the `stdenv' and `system' attributes, since `mkDerivation' already does that. svn path=/nixpkgs/trunk/; revision=866
2004-03-28 23:07:43 +02:00
* Remove trivial builders. * Make builders unexecutable by removing the hash-bang line and execute permission. * Convert calls to `derivation' to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to `mkDerivation'. These transformations were all done automatically, so it is quite possible I broke stuff. * Put the `mkDerivation' function in stdenv/generic. svn path=/nixpkgs/trunk/; revision=874
2004-03-29 19:23:01 +02:00
inherit stdenv;
* It is now possible to execute a builder using a shell inside the Nix store, rather than outside (such as /bin/sh). For instance, the Nix expression for the ATerm library now looks like this: {stdenv, fetchurl}: stdenv.mkDerivation { name = "aterm-2.0.5"; builder = ./builder.sh; ... } where `mkDerivation' is a helper function in `stdenv' that massages the given attribute set into using the bash shell that is part of the standard environment: mkDerivation = attrs: derivation (att s // { builder = pkgs.bash ~ /bin/sh; args = ["-e" attrs.builder]; stdenv = (...); system = (...).system; }); Note that this makes it unnecessary to set the `stdenv' and `system' attributes, since `mkDerivation' already does that. svn path=/nixpkgs/trunk/; revision=866
2004-03-28 23:07:43 +02:00
* Remove trivial builders. * Make builders unexecutable by removing the hash-bang line and execute permission. * Convert calls to `derivation' to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to `mkDerivation'. These transformations were all done automatically, so it is quite possible I broke stuff. * Put the `mkDerivation' function in stdenv/generic. svn path=/nixpkgs/trunk/; revision=874
2004-03-29 19:23:01 +02:00
gcc = gccWrapper {
name = pkgs.gcc.name;
nativeTools = false;
nativeGlibc = false;
inherit (pkgs) gcc binutils;
* Finally we have a working stdenvLinux again. On the downside, the build process of stdenvLinux builds gcc 9 times (3 x 3 bootstrap stages). That's a bit excessive. svn path=/nixpkgs/trunk/; revision=880
2004-03-30 14:46:52 +02:00
inherit stdenv glibc;
shell = pkgs.bash ~ /bin/sh;
* Remove trivial builders. * Make builders unexecutable by removing the hash-bang line and execute permission. * Convert calls to `derivation' to `mkDerivation'. * Remove `system' and `stdenv' attributes from calls to `mkDerivation'. These transformations were all done automatically, so it is quite possible I broke stuff. * Put the `mkDerivation' function in stdenv/generic. svn path=/nixpkgs/trunk/; revision=874
2004-03-29 19:23:01 +02:00
};
* It is now possible to execute a builder using a shell inside the Nix store, rather than outside (such as /bin/sh). For instance, the Nix expression for the ATerm library now looks like this: {stdenv, fetchurl}: stdenv.mkDerivation { name = "aterm-2.0.5"; builder = ./builder.sh; ... } where `mkDerivation' is a helper function in `stdenv' that massages the given attribute set into using the bash shell that is part of the standard environment: mkDerivation = attrs: derivation (att s // { builder = pkgs.bash ~ /bin/sh; args = ["-e" attrs.builder]; stdenv = (...); system = (...).system; }); Note that this makes it unnecessary to set the `stdenv' and `system' attributes, since `mkDerivation' already does that. svn path=/nixpkgs/trunk/; revision=866
2004-03-28 23:07:43 +02:00
* Finally we have a working stdenvLinux again. On the downside, the build process of stdenvLinux builds gcc 9 times (3 x 3 bootstrap stages). That's a bit excessive. svn path=/nixpkgs/trunk/; revision=880
2004-03-30 14:46:52 +02:00
shell = pkgs.bash ~ /bin/sh;
* Updated to reflect the changes to the grammar. svn path=/nixpkgs/trunk/; revision=464
2003-11-03 11:22:00 +01:00
}
Reference in a new issue Copy permalink