uclibc: Provide a more stable location for source.

At the upstream URL at http://git.uclibc.org/uClibc/snapshot/, older
versions are dropped at a regular basis. Unfortunately the tarball
"uClibc-20150131.tar.bz2" has already been deleted from that directory
and I didn't find a mirror providing the same file.

So I've switched it to use fetchzip from the cgit site instead of using
fetchgit directly. The reason why I didn't use fetchgit is that we'd
need need git, which depends (indirectly? not sure, haven't checked) on
libiconv and that in turn triggers an assertion if we're on Linux and
are cross-building using uclibc.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-08-19 18:34:29 +02:00
parent bc46013ac1
commit 50e9dd7da1
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 10 additions and 7 deletions

View file

@ -1,4 +1,4 @@
{stdenv, fetchurl, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
{stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
extraConfig ? ""}:
assert stdenv.isLinux;
@ -52,15 +52,18 @@ let
UCLIBC_HAS_FPU n
'';
name = "uclibc-0.9.34-pre-20150131";
rev = "343f6b8f1f754e397632b0552e4afe586c8b392b";
in
stdenv.mkDerivation {
name = "uclibc-0.9.34-pre-20150131" + stdenv.lib.optionalString (cross != null)
("-" + cross.config);
name = name + stdenv.lib.optionalString (cross != null) ("-" + cross.config);
src = fetchurl {
url = http://www.uclibc.org/downloads/snapshots/uClibc-20150131.tar.bz2;
sha256 = "14svyxw4nizdcz4vqk9nizlgy32d8ngpvcca34jjbdjjg77xdvkc";
src = fetchzip {
name = name + "-source";
url = "http://git.uclibc.org/uClibc/snapshot/uClibc-${rev}.tar.bz2";
sha256 = "1kgylzpid7da5i7wz7slh5q9rnq1m8bv5h9ilm76g0xwc2iwlhbw";
};
# 'ftw' needed to build acl, a coreutils dependency

View file

@ -10268,7 +10268,7 @@ let
uclibc = callPackage ../os-specific/linux/uclibc { };
uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
inherit fetchurl stdenv libiconvReal;
inherit fetchzip stdenv libiconvReal;
linuxHeaders = linuxHeadersCross;
gccCross = gccCrossStageStatic;
cross = assert crossSystem != null; crossSystem;