diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-19 15:13:46 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-05-19 15:13:46 +0000 |
| commit | e283f861746bdaba44e4f58478ba2a5b1e3257e4 (patch) | |
| tree | cd8ae26194d793d1dc429c92e6b4390b075fcc74 | |
| parent | 90b3af3bd726c0f66235f77e747c0d73bc71a885 (diff) | |
| download | nixlib-e283f861746bdaba44e4f58478ba2a5b1e3257e4.tar nixlib-e283f861746bdaba44e4f58478ba2a5b1e3257e4.tar.gz nixlib-e283f861746bdaba44e4f58478ba2a5b1e3257e4.tar.bz2 nixlib-e283f861746bdaba44e4f58478ba2a5b1e3257e4.tar.lz nixlib-e283f861746bdaba44e4f58478ba2a5b1e3257e4.tar.xz nixlib-e283f861746bdaba44e4f58478ba2a5b1e3257e4.tar.zst nixlib-e283f861746bdaba44e4f58478ba2a5b1e3257e4.zip | |
Making nixUnstable ready to cross build.
That requires bzip2 to cross build properly, and this is done only in stdenv-updates. svn path=/nixpkgs/trunk/; revision=21878
| -rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 6e0f38f69c26..adcac62070e1 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -22,6 +22,17 @@ stdenv.mkDerivation rec { CFLAGS=-O3 CXXFLAGS=-O3 ''; + crossAttrs = { + configureFlags = + '' + --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-bzip2=${bzip2.hostDrv} + --disable-init-state + CFLAGS=-O3 CXXFLAGS=-O3 + ''; + doCheck = false; + }; + doCheck = true; meta = { |