diff options
| author | Emery Hemingway <ehmry@posteo.net> | 2020-05-07 14:02:14 +0530 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2020-08-02 22:37:39 +0200 |
| commit | f5ef00a12ff23f120f02eeb8820bf3e7338506e4 (patch) | |
| tree | 8035095b9bdbc57c778e45b03a6e4dd248033e5e | |
| parent | 67af42e35ff6e233f301bdd26c774cef1c236025 (diff) | |
| download | nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.gz nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.bz2 nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.lz nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.xz nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.tar.zst nixpkgs-f5ef00a12ff23f120f02eeb8820bf3e7338506e4.zip | |
gnu-config: 2019-04-15 -> 2020-05-04
Update gnu-config (config.sub, config.guess) to suport the Genode platform and apply the updateAutotoolsGnuConfigScriptsHook to Genode cross-compilation.
| -rw-r--r-- | pkgs/development/libraries/gnu-config/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/stdenv/cross/default.nix | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index e45ec957eb9..5acab2a70e0 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -1,21 +1,20 @@ { stdenv, fetchurl }: let - rev = "a8d79c3130da83c7cacd6fee31b9acc53799c406"; + rev = "e78c96e5288993aaea3ec44e5c6ee755c668da79"; # 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 = "0qbq49gr2cmf4gzrjvrmpwxxgzl3vap1xm902xa8pkcqdvriq0qw"; + sha256 = "sha256-TSLpYIDGSp1flqCBi2Sgg9IWDV5bcO+Hn2Menv3R6KU="; }; configSub = fetchurl { url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; - sha256 = "0i699axqfkxk9mgv1hlms5r44pf0s642yz75ajjjpwzhw4d5pnv4"; + sha256 = "sha256-DkCGDN/DE3phQ1GO/Ua5ZPPtp0Ya93PnW3yfSK8EV9s="; }; -in -stdenv.mkDerivation { +in stdenv.mkDerivation { pname = "gnu-config"; - version = "2019-04-15"; + version = "2020-05-04"; buildCommand = '' mkdir -p $out diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 0f575289889..6ac03b7908f 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -72,7 +72,8 @@ in lib.init bootStages ++ [ (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf ] ++ lib.optional - (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS; in f hostPlatform && !(f buildPlatform)) + (let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode; + in f hostPlatform && !(f buildPlatform) ) buildPackages.updateAutotoolsGnuConfigScriptsHook # without proper `file` command, libtool sometimes fails # to recognize 64-bit DLLs |