pyrox.dev / nixpkgs
lol
fork atom

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.

authored by sterni and committed by GitHub bc6da686 9911b1c7

+7 -9
unified split
+7 -7
pkgs/os-specific/linux/bionic-prebuilt/default.nix
··· 1 - { stdenvNoCC, lib, fetchurl, fetchzip, pkgs 2 }: 3 let 4 ··· 28 29 kernelHeaders = pkgs.makeLinuxHeaders { 30 version = "android-common-11-5.4"; 31 - src = fetchurl { 32 url = "https://android.googlesource.com/kernel/common/+archive/48ffcbf0b9e7f0280bfb8c32c68da0aaf0fdfef6.tar.gz"; 33 - sha256 = "0ksm1243zm9hsv0a6q9v15jabf2rivsn14kmnm2qw6zk3mjd4jvv"; 34 }; 35 }; 36 ··· 39 pname = "bionic-prebuilt"; 40 version = "ndk-release-r23"; 41 42 - src = fetchurl { 43 url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; 44 - sha256 = "0cfkwdcb2c9nnlmkx0inbsja3cyiha71nj92lm66m5an70zc3b8q"; 45 }; 46 - 47 - sourceRoot = "."; 48 49 NIX_DONT_SET_RPATH = true; 50
··· 1 + { stdenvNoCC, lib, fetchzip, pkgs 2 }: 3 let 4 ··· 28 29 kernelHeaders = pkgs.makeLinuxHeaders { 30 version = "android-common-11-5.4"; 31 + src = fetchzip { 32 url = "https://android.googlesource.com/kernel/common/+archive/48ffcbf0b9e7f0280bfb8c32c68da0aaf0fdfef6.tar.gz"; 33 + sha256 = "1y7cmlmcr5vdqydd9n785s139yc4aylc3zhqa59xsylmkaf5habk"; 34 + stripRoot = false; 35 }; 36 }; 37 ··· 40 pname = "bionic-prebuilt"; 41 version = "ndk-release-r23"; 42 43 + src = fetchzip { 44 url = "https://android.googlesource.com/platform/bionic/+archive/00e8ce1142d8823b0d2fc8a98b40119b0f1f02cd.tar.gz"; 45 + sha256 = "10z5mp4w0acvjvgxv7wlqa7m70hcyarmjdlfxbd9rwzf4mrsr8d1"; 46 + stripRoot = false; 47 }; 48 49 NIX_DONT_SET_RPATH = true; 50
-2
pkgs/os-specific/linux/kernel-headers/default.nix
··· 30 31 hardeningDisable = lib.optional stdenvNoCC.buildPlatform.isDarwin "format"; 32 33 - sourceRoot = lib.optionalString stdenvNoCC.hostPlatform.isAndroid "."; 34 - 35 makeFlags = [ 36 "SHELL=bash" 37 # Avoid use of runtime build->host compilers for checks. These
··· 30 31 hardeningDisable = lib.optional stdenvNoCC.buildPlatform.isDarwin "format"; 32 33 makeFlags = [ 34 "SHELL=bash" 35 # Avoid use of runtime build->host compilers for checks. These