Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bionic: use fetchzip for everything #123010

Merged
merged 1 commit into from May 16, 2021
Merged

bionic: use fetchzip for everything #123010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions pkgs/os-specific/linux/bionic-prebuilt/default.nix
View file
Open in desktop
@@ -1,4 +1,4 @@
{ stdenvNoCC, lib, fetchurl, fetchzip, pkgs
{ stdenvNoCC, lib, fetchzip, pkgs
}:
let

Expand Down Expand Up @@ -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;
};
};

Expand All @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions pkgs/os-specific/linux/kernel-headers/default.nix
View file
Open in desktop
Expand Up @@ -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
Expand Down