gnu-config: bump to latest version for wasi
This commit is contained in:
parent
556466d52f
commit
4048acb5cf
|
@ -1,21 +1,21 @@
|
||||||
{ stdenv, fetchurl }:
|
{ stdenv, fetchurl }:
|
||||||
|
|
||||||
let
|
let
|
||||||
rev = "b75cdc942a6172f63b34faf642b8c797239f6776";
|
rev = "a8d79c3130da83c7cacd6fee31b9acc53799c406";
|
||||||
|
|
||||||
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
|
# Don't use fetchgit as this is needed during Aarch64 bootstrapping
|
||||||
configGuess = fetchurl {
|
configGuess = fetchurl {
|
||||||
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
|
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
|
||||||
sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv";
|
sha256 = "0qbq49gr2cmf4gzrjvrmpwxxgzl3vap1xm902xa8pkcqdvriq0qw";
|
||||||
};
|
};
|
||||||
configSub = fetchurl {
|
configSub = fetchurl {
|
||||||
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
|
url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
|
||||||
sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc";
|
sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnu-config-${version}";
|
name = "gnu-config-${version}";
|
||||||
version = "2016-12-31";
|
version = "2019-04-15";
|
||||||
|
|
||||||
buildCommand = ''
|
buildCommand = ''
|
||||||
mkdir -p $out
|
mkdir -p $out
|
||||||
|
|
|
@ -64,7 +64,7 @@ in lib.init bootStages ++ [
|
||||||
(hostPlatform.isLinux && !buildPlatform.isLinux)
|
(hostPlatform.isLinux && !buildPlatform.isLinux)
|
||||||
[ buildPackages.patchelf ]
|
[ buildPackages.patchelf ]
|
||||||
++ lib.optional
|
++ lib.optional
|
||||||
(let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform))
|
(let f = p: !p.isx86 || p.libc == "musl" || p.libc == "wasilibc"; in f hostPlatform && !(f buildPlatform))
|
||||||
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
||||||
# without proper `file` command, libtool sometimes fails
|
# without proper `file` command, libtool sometimes fails
|
||||||
# to recognize 64-bit DLLs
|
# to recognize 64-bit DLLs
|
||||||
|
|
Loading…
Reference in a new issue