diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:27:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-12 12:29:24 +0100 |
| commit | a2c316288c8f3714e57dc1037d7a993a2088ab18 (patch) | |
| tree | ee4af0b96a5bc0e55b92c8d76465b333a698a260 /pkgs/stdenv/linux | |
| parent | 51713fbbfcaf819f176df8f3ce75f57880aeb690 (diff) | |
| parent | a0070a9157d7d145eed22160cec2562d24032013 (diff) | |
| download | nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.gz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.bz2 nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.lz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.xz nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.tar.zst nixlib-a2c316288c8f3714e57dc1037d7a993a2088ab18.zip | |
Merge master into stdenv-updates
Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix index c4ec02aeb3e6..9ea63a46be3e 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix @@ -83,7 +83,7 @@ let isl = pkgs.isl.crossDrv; mpc = pkgs.mpc.crossDrv; binutils = pkgs.binutils.crossDrv; - klibc = pkgs.klibc.crossDrv; + klibc = pkgs.linuxPackages.klibc.crossDrv; in |