diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-09 17:16:02 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-09 17:16:02 +0000 |
| commit | a1b3ae0c8121b932beeceb46bef816bdb2a9f180 (patch) | |
| tree | 133e900166190bea4d12ac38a6f82319f6e4eccf /pkgs/test/simple | |
| parent | ab73ec398bb3b0baac73196df2b8bbcf6171cb56 (diff) | |
| download | nixpkgs-a1b3ae0c8121b932beeceb46bef816bdb2a9f180.tar nixpkgs-a1b3ae0c8121b932beeceb46bef816bdb2a9f180.tar.gz nixpkgs-a1b3ae0c8121b932beeceb46bef816bdb2a9f180.tar.bz2 nixpkgs-a1b3ae0c8121b932beeceb46bef816bdb2a9f180.tar.lz nixpkgs-a1b3ae0c8121b932beeceb46bef816bdb2a9f180.tar.xz nixpkgs-a1b3ae0c8121b932beeceb46bef816bdb2a9f180.tar.zst nixpkgs-a1b3ae0c8121b932beeceb46bef816bdb2a9f180.zip | |
* stdenv-nix-linux should more-or-less work again now.
svn path=/nixpkgs/trunk/; revision=826
Diffstat (limited to 'pkgs/test/simple')
| -rwxr-xr-x | pkgs/test/simple/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/test/simple/default.nix | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh index 282fc520bd1..58bf16c43b3 100755 --- a/pkgs/test/simple/builder.sh +++ b/pkgs/test/simple/builder.sh @@ -4,7 +4,7 @@ export NIX_DEBUG=1 . $stdenv/setup -#export NIX_CFLAGS_COMPILE="-v $NIX_CFLAGS_COMPILE" +export NIX_ENFORCE_PURITY=1 mkdir $out mkdir $out/bin @@ -24,6 +24,8 @@ gcc -L /nix/store/abcd/lib -isystem /usr/lib hello.c -o $out/bin/hello $out/bin/hello +exit 0 + cat > hello2.cc <<EOF #include <iostream> diff --git a/pkgs/test/simple/default.nix b/pkgs/test/simple/default.nix index 2d582f03a51..9374a6ede28 100644 --- a/pkgs/test/simple/default.nix +++ b/pkgs/test/simple/default.nix @@ -1,12 +1,12 @@ let { system = "i686-linux"; - stdenvInitial = (import ../../stdenv/initial) { - name = "stdenv-initial"; - inherit system; + stdenvs = (import ../../system/stdenvs.nix) { + system = "i686-linux"; + allPackages = import ../../system/all-packages-generic.nix; }; - stdenv = (import ../../stdenv/native) {stdenv = stdenvInitial;}; + stdenv = stdenvs.stdenvLinuxBoot1; test = derivation { name = "simple-test"; |