diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-30 12:46:52 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-30 12:46:52 +0000 |
| commit | 01a1658c6b8cdf75ad87ea24d1f82bc6c17670d4 (patch) | |
| tree | f47da9f336227f99789f4f819837dcd25cc566c0 /pkgs/test | |
| parent | 68327c3a9dbbea3cd647c509d8cfd2db8ccd0c72 (diff) | |
* 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
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/simple/builder.sh | 2 | ||||
| -rw-r--r-- | pkgs/test/simple/default.nix | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh index 7455f3e22748..dcfa49bd9c31 100644 --- a/pkgs/test/simple/builder.sh +++ b/pkgs/test/simple/builder.sh @@ -39,4 +39,4 @@ g++ hello2.cc -o $out/bin/hello2 -DVALUE="1 + 2 * 3" $out/bin/hello2 -ld -v
\ No newline at end of file +ld -v diff --git a/pkgs/test/simple/default.nix b/pkgs/test/simple/default.nix index 0201097dc7d3..b7d9446bac7f 100644 --- a/pkgs/test/simple/default.nix +++ b/pkgs/test/simple/default.nix @@ -2,15 +2,14 @@ let { system = "i686-linux"; stdenvs = (import ../../system/stdenvs.nix) { - system = "i686-linux"; + inherit system; allPackages = import ../../system/all-packages-generic.nix; }; - stdenv = stdenvs.stdenvLinux; + stdenv = stdenvs.stdenvNix; - test = derivation { + test = stdenv.mkDerivation { name = "simple-test"; - inherit system stdenv; builder = ./builder.sh; }; |