public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix_bootstrap_tools' of https://github.com/offlinehacker/nixpkgs into staging

Browse Source
This commit is contained in:
Eelco Dolstra 2014-12-17 13:51:51 +01:00
commit 8d66a51a87
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/uclibc/default.nix
View File

@ -48,12 +48,12 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "uclibc-0.9.34-pre-20141029" + stdenv.lib.optionalString (cross != null) name = "uclibc-0.9.34-pre-20141215" + stdenv.lib.optionalString (cross != null)
("-" + cross.config); ("-" + cross.config);
src = fetchurl { src = fetchurl {
url = http://www.uclibc.org/downloads/snapshots/uClibc-20141029.tar.bz2; url = http://www.uclibc.org/downloads/snapshots/uClibc-20141215.tar.bz2;
sha256 = "018r3bhw1jyyihmm5xxq1psl3r5yx02a57p8qxvay3vvzxn2cvzm"; sha256 = "07d1fmnc2yapfhhadr5c8q7591xqxxqmiicmcgcn8sqmaxppzp5f";
}; };
# 'ftw' needed to build acl, a coreutils dependency # 'ftw' needed to build acl, a coreutils dependency

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -52,6 +52,8 @@ rec {
cp -d ${glibc}/lib/libpthread*.so* $out/lib cp -d ${glibc}/lib/libpthread*.so* $out/lib
cp -d ${glibc}/lib/libnsl*.so* $out/lib cp -d ${glibc}/lib/libnsl*.so* $out/lib
cp -d ${glibc}/lib/libutil*.so* $out/lib cp -d ${glibc}/lib/libutil*.so* $out/lib
cp -d ${glibc}/lib/libnss*.so* $out/lib
cp -d ${glibc}/lib/libresolv*.so* $out/lib
cp -d ${glibc}/lib/crt?.o $out/lib cp -d ${glibc}/lib/crt?.o $out/lib
cp -rL ${glibc}/include $out cp -rL ${glibc}/include $out