diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-17 13:51:51 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-12-17 13:51:51 +0100 |
| commit | 8d66a51a872af1ab58edc68a2ebddcc79958b563 (patch) | |
| tree | b2beb397ef992e885bdf0a290239d4d5c5139587 /pkgs | |
| parent | e7ad8af28e16bcd7e5503fcd991dbdf4f0d86a3e (diff) | |
| parent | 3d7f66e955b64735a6881c9d0fc36ede45f5168e (diff) | |
| download | nixlib-8d66a51a872af1ab58edc68a2ebddcc79958b563.tar nixlib-8d66a51a872af1ab58edc68a2ebddcc79958b563.tar.gz nixlib-8d66a51a872af1ab58edc68a2ebddcc79958b563.tar.bz2 nixlib-8d66a51a872af1ab58edc68a2ebddcc79958b563.tar.lz nixlib-8d66a51a872af1ab58edc68a2ebddcc79958b563.tar.xz nixlib-8d66a51a872af1ab58edc68a2ebddcc79958b563.tar.zst nixlib-8d66a51a872af1ab58edc68a2ebddcc79958b563.zip | |
Merge branch 'fix_bootstrap_tools' of https://github.com/offlinehacker/nixpkgs into staging
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/uclibc/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 169733112054..1b866711225d 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -48,12 +48,12 @@ let in 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); src = fetchurl { - url = http://www.uclibc.org/downloads/snapshots/uClibc-20141029.tar.bz2; - sha256 = "018r3bhw1jyyihmm5xxq1psl3r5yx02a57p8qxvay3vvzxn2cvzm"; + url = http://www.uclibc.org/downloads/snapshots/uClibc-20141215.tar.bz2; + sha256 = "07d1fmnc2yapfhhadr5c8q7591xqxxqmiicmcgcn8sqmaxppzp5f"; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index e202f691fa8d..767b1f288c0f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -52,6 +52,8 @@ rec { cp -d ${glibc}/lib/libpthread*.so* $out/lib cp -d ${glibc}/lib/libnsl*.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 -rL ${glibc}/include $out |