mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
Updating from trunk, to get the main evaluation fix about libcCross.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20512
This commit is contained in:
parent
6f9a783232
commit
9665611c9e
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, ncurses ? null, ... }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "util-linux-ng-2.16.2";
|
||||
name = "util-linux-ng-2.17.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/utils/util-linux-ng/v2.16/${name}.tar.bz2";
|
||||
sha256 = "1sx3z64z8z95v93k0c9lczcp04zw4nm3d2rkhczkyxcpdfcgbhxi";
|
||||
url = "mirror://kernel/linux/utils/util-linux-ng/v2.17/${name}.tar.bz2";
|
||||
sha256 = "140k32jqg9192vskdb3p98q99qgr14029h975nw21p426zm1kh79";
|
||||
};
|
||||
|
||||
configureFlags = ''
|
||||
|
@ -3747,7 +3747,7 @@ let
|
||||
else if (name == "uclibc") then uclibcCross
|
||||
else throw "Unknown libc";
|
||||
|
||||
libcCross = libcCrossChooser crossSystem.libc;
|
||||
libcCross = assert crossSystem != null; libcCrossChooser crossSystem.libc;
|
||||
|
||||
eglibc = import ../development/libraries/eglibc {
|
||||
inherit fetchsvn stdenv;
|
||||
|
Loading…
Reference in New Issue
Block a user