public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
sterni 2021-05-16 07:24:27 +02:00 committed by GitHub
parent 9911b1c75b
commit bc6da68650
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/os-specific/linux/bionic-prebuilt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenvNoCC, lib, fetchurl, fetchzip, pkgs { stdenvNoCC, lib, fetchzip, pkgs
}: }:
let let
@ -28,9 +28,10 @@ let
kernelHeaders = pkgs.makeLinuxHeaders { kernelHeaders = pkgs.makeLinuxHeaders {
version = "android-common-11-5.4"; version = "android-common-11-5.4";
src = fetchurl { src = fetchzip {
url = "https://android.googlesource.com/kernel/common/+archive/48ffcbf0b9e7f0280bfb8c32c68da0aaf0fdfef6.tar.gz"; 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"; pname = "bionic-prebuilt";
version = "ndk-release-r23"; version = "ndk-release-r23";
src = fetchurl { src = fetchzip {
url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz";
sha256 = "0cfkwdcb2c9nnlmkx0inbsja3cyiha71nj92lm66m5an70zc3b8q"; sha256 = "10z5mp4w0acvjvgxv7wlqa7m70hcyarmjdlfxbd9rwzf4mrsr8d1";
stripRoot = false;
}; };
sourceRoot = ".";
NIX_DONT_SET_RPATH = true; NIX_DONT_SET_RPATH = true;
dontConfigure = true; dontConfigure = true;

2
pkgs/os-specific/linux/kernel-headers/default.nix
View File

@ -30,8 +30,6 @@ let
hardeningDisable = lib.optional stdenvNoCC.buildPlatform.isDarwin "format"; hardeningDisable = lib.optional stdenvNoCC.buildPlatform.isDarwin "format";
sourceRoot = lib.optionalString stdenvNoCC.hostPlatform.isAndroid ".";
makeFlags = [ makeFlags = [
"SHELL=bash" "SHELL=bash"
# Avoid use of runtime build->host compilers for checks. These # Avoid use of runtime build->host compilers for checks. These