diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-11 17:26:14 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2004-03-11 17:26:14 +0000 |
| commit | de13527000165c566e47d2146a1a6480fc67da59 (patch) | |
| tree | 12f84ad99f15678dde1c6282ed78db37e776914a /pkgs/test | |
| parent | a1b3ae0c8121b932beeceb46bef816bdb2a9f180 (diff) | |
| download | nixpkgs-de13527000165c566e47d2146a1a6480fc67da59.tar nixpkgs-de13527000165c566e47d2146a1a6480fc67da59.tar.gz nixpkgs-de13527000165c566e47d2146a1a6480fc67da59.tar.bz2 nixpkgs-de13527000165c566e47d2146a1a6480fc67da59.tar.lz nixpkgs-de13527000165c566e47d2146a1a6480fc67da59.tar.xz nixpkgs-de13527000165c566e47d2146a1a6480fc67da59.tar.zst nixpkgs-de13527000165c566e47d2146a1a6480fc67da59.zip | |
* Finally got stdenv-nix-linux working again. Still not perfect,
though. * libxml2: upgrade to latest. * octavefront/rna: keep debug info. svn path=/nixpkgs/trunk/; revision=830
Diffstat (limited to 'pkgs/test')
| -rwxr-xr-x | pkgs/test/simple/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/test/simple/default.nix | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/test/simple/builder.sh b/pkgs/test/simple/builder.sh index 58bf16c43b3..cfc895ac139 100755 --- a/pkgs/test/simple/builder.sh +++ b/pkgs/test/simple/builder.sh @@ -1,10 +1,15 @@ #! /bin/sh +set -x + export NIX_DEBUG=1 . $stdenv/setup -export NIX_ENFORCE_PURITY=1 +#echo starting shell +#/bin/sh < /dev/tty > /dev/tty 2>&1 + +#exit 1 mkdir $out mkdir $out/bin @@ -24,8 +29,6 @@ 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 9374a6ede28..39b0416fc9a 100644 --- a/pkgs/test/simple/default.nix +++ b/pkgs/test/simple/default.nix @@ -6,7 +6,7 @@ let { allPackages = import ../../system/all-packages-generic.nix; }; - stdenv = stdenvs.stdenvLinuxBoot1; + stdenv = stdenvs.stdenvLinuxBoot2; test = derivation { name = "simple-test"; |