diff options
| author | sterni <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-16 07:24:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-16 01:24:27 -0400 |
| commit | bc6da686504d0dad7e451e65c030b6c423f84e8a (patch) | |
| tree | 8d209fd50623b982d61faae9b185b20fbe4f270d | |
| parent | 9911b1c75b8f7399a38ba58e5d5ba254f0c092d2 (diff) | |
| download | nixpkgs-bc6da686504d0dad7e451e65c030b6c423f84e8a.tar nixpkgs-bc6da686504d0dad7e451e65c030b6c423f84e8a.tar.gz nixpkgs-bc6da686504d0dad7e451e65c030b6c423f84e8a.tar.bz2 nixpkgs-bc6da686504d0dad7e451e65c030b6c423f84e8a.tar.lz nixpkgs-bc6da686504d0dad7e451e65c030b6c423f84e8a.tar.xz nixpkgs-bc6da686504d0dad7e451e65c030b6c423f84e8a.tar.zst nixpkgs-bc6da686504d0dad7e451e65c030b6c423f84e8a.zip | |
bionic: use fetchzip for everything (#123010)
Since the hashes of the remaining two archives that used fetchurl broke, now as good a time as any to switch the remaining fetchurls to fetchzip.
| -rw-r--r-- | pkgs/os-specific/linux/bionic-prebuilt/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel-headers/default.nix | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/bionic-prebuilt/default.nix b/pkgs/os-specific/linux/bionic-prebuilt/default.nix index 4536067cbf3..920732a2020 100644 --- a/pkgs/os-specific/linux/bionic-prebuilt/default.nix +++ b/pkgs/os-specific/linux/bionic-prebuilt/default.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, lib, fetchurl, fetchzip, pkgs +{ stdenvNoCC, lib, fetchzip, pkgs }: let @@ -28,9 +28,10 @@ let kernelHeaders = pkgs.makeLinuxHeaders { version = "android-common-11-5.4"; - src = fetchurl { + src = fetchzip { url = "https://android.googlesource.com/kernel/common/+archive/48ffcbf0b9e7f0280bfb8c32c68da0aaf0fdfef6.tar.gz"; - sha256 = "0ksm1243zm9hsv0a6q9v15jabf2rivsn14kmnm2qw6zk3mjd4jvv"; + sha256 = "1y7cmlmcr5vdqydd9n785s139yc4aylc3zhqa59xsylmkaf5habk"; + stripRoot = false; }; }; @@ -39,13 +40,12 @@ stdenvNoCC.mkDerivation rec { pname = "bionic-prebuilt"; version = "ndk-release-r23"; - src = fetchurl { + src = fetchzip { url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; - sha256 = "0cfkwdcb2c9nnlmkx0inbsja3cyiha71nj92lm66m5an70zc3b8q"; + sha256 = "10z5mp4w0acvjvgxv7wlqa7m70hcyarmjdlfxbd9rwzf4mrsr8d1"; + stripRoot = false; }; - sourceRoot = "."; - NIX_DONT_SET_RPATH = true; dontConfigure = true; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index d9dac5e53a5..9d727838b3f 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -30,8 +30,6 @@ let hardeningDisable = lib.optional stdenvNoCC.buildPlatform.isDarwin "format"; - sourceRoot = lib.optionalString stdenvNoCC.hostPlatform.isAndroid "."; - makeFlags = [ "SHELL=bash" # Avoid use of runtime build->host compilers for checks. These |