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

Merge pull request #168768 from lukegb/pomerium

Browse Source 
envoy: support aarch64-linux
This commit is contained in:
Mario Rodas 2022-04-17 08:55:07 -05:00 committed by GitHub
commit c8ec562e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/http/envoy/default.nix
View File

@ -74,7 +74,10 @@ buildBazelPackage rec {
];
fetchAttrs = {
sha256 = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8";
sha256 = {
x86_64-linux = "0f7mls2zrpjjvbz6pgkzrvr55bv05xn2l76j9i1r0cf367qqfkz8";
aarch64-linux = "1l3ls47z20xrw6x9qps5jm7vq50xb1acv9gczfdrj9hw6jybgwgg";
}.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
dontUseCmakeConfigure = true;
dontUseGnConfigure = true;
preInstall = ''
@ -124,6 +127,7 @@ buildBazelPackage rec {
"--noexperimental_strict_action_env"
"--cxxopt=-Wno-maybe-uninitialized"
"--cxxopt=-Wno-uninitialized"
"--cxxopt=-Wno-error=type-limits"
];
passthru.tests = {
@ -137,6 +141,6 @@ buildBazelPackage rec {
description = "Cloud-native edge and service proxy";
license = licenses.asl20;
maintainers = with maintainers; [ lukegb ];
platforms = [ "x86_64-linux" ]; # Other platforms will generate different fetch hashes.
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

2
pkgs/servers/http/pomerium/default.nix
View File

@ -86,6 +86,6 @@ buildGoModule rec {
description = "Authenticating reverse proxy";
license = licenses.asl20;
maintainers = with maintainers; [ lukegb ];
platforms = [ "x86_64-linux" ]; # Envoy derivation is x86_64-linux only.
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -21275,7 +21275,7 @@ with pkgs;
engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; };
envoy = callPackage ../servers/http/envoy {
jdk = openjdk11;
jdk = openjdk11_headless;
gn = gn1924;
};