From 4048acb5cf533d35f25221af200fc40d07f25a63 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 16 Apr 2019 21:32:59 -0400 Subject: [PATCH] gnu-config: bump to latest version for wasi --- pkgs/development/libraries/gnu-config/default.nix | 8 ++++---- pkgs/stdenv/cross/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 3f0fcafa447..7918fb7b9c4 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl }: let - rev = "b75cdc942a6172f63b34faf642b8c797239f6776"; + rev = "a8d79c3130da83c7cacd6fee31b9acc53799c406"; # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; - sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv"; + sha256 = "0qbq49gr2cmf4gzrjvrmpwxxgzl3vap1xm902xa8pkcqdvriq0qw"; }; configSub = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc"; + sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; }; in stdenv.mkDerivation rec { name = "gnu-config-${version}"; - version = "2016-12-31"; + version = "2019-04-15"; buildCommand = '' mkdir -p $out diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 479213f3a56..201c9378682 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -64,7 +64,7 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ 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 # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs