diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix index 8be86eedb3e..afc5ed3d5c3 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix @@ -76,8 +76,12 @@ let gcc = pkgs.gcc47; gmp = pkgs.gmp.hostDrv; mpfr = pkgs.mpfr.hostDrv; - #ppl = pkgs.ppl.hostDrv; - #cloogppl = pkgs.cloogppl.hostDrv; + ppl = pkgs.ppl.hostDrv; + cloogppl = pkgs.cloogppl.hostDrv; + cloog = pkgs.cloog.hostDrv; + zlib = pkgs.zlib.hostDrv; + isl = pkgs.isl.hostDrv; + mpc = pkgs.mpc.hostDrv; binutils = pkgs.binutils.hostDrv; klibc = pkgs.klibc.hostDrv; @@ -99,6 +103,8 @@ rec { linkStatic = true; }; + inherit pkgs; + build = stdenv.mkDerivation { @@ -178,6 +184,12 @@ rec { cp -d ${gmp}/lib/libgmp*.so* $out/lib cp -d ${mpfr}/lib/libmpfr*.so* $out/lib + cp -d ${cloogppl}/lib/libcloog*.so* $out/lib + cp -d ${cloog}/lib/libcloog*.so* $out/lib + cp -d ${ppl}/lib/libppl*.so* $out/lib + cp -d ${isl}/lib/libisl*.so* $out/lib + cp -d ${mpc}/lib/libmpc*.so* $out/lib + cp -d ${zlib}/lib/libz.so* $out/lib # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do