nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 23:43:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #328791 from Artturin/androidfixes

Browse Source 
androidndkPkgs: Fix unsupported hardening flags & rename `androidndkPkgs_23b`
This commit is contained in:
Masum Reza 2024-07-22 09:51:33 +05:30 committed by GitHub
commit 453402b94f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, makeWrapper
, runCommand, wrapBintoolsWith, wrapCCWith, autoPatchelfHook
, buildAndroidndk, androidndk, targetAndroidndkPkgs
, llvmPackages, buildAndroidndk, androidndk, targetAndroidndkPkgs
}:
let
@ -63,6 +63,7 @@ rec {
passthru = {
inherit targetPrefix;
isClang = true; # clang based cc, but bintools ld
inherit (llvmPackages.clang.cc) hardeningUnsupportedFlagsByTargetPlatform;
};
dontUnpack = true;
dontBuild = true;

19
pkgs/development/androidndk-pkgs/default.nix
View File

@ -1,8 +1,8 @@
{ lib, androidenv, buildPackages, pkgs, targetPackages
{ lib, androidenv, buildPackages, pkgs, targetPackages, androidndkPkgs_23, config
}:
let
makeNdkPkgs = ndkVersion:
makeNdkPkgs = ndkVersion: llvmPackages:
let
buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages {
includeNDK = true;
@ -22,6 +22,10 @@ let
inherit (pkgs)
stdenv
runCommand wrapBintoolsWith wrapCCWith;
# For hardeningUnsupportedFlagsByTargetPlatform
inherit llvmPackages;
# buildPackages.foo rather than buildPackages.buildPackages.foo would work,
# but for splicing messing up on infinite recursion for the variants we
# *dont't* use. Using this workaround, but also making a test to ensure
@ -33,9 +37,10 @@ let
in
{
"21" = makeNdkPkgs "21.0.6113669";
"23b" = makeNdkPkgs "23.1.7779620";
"24" = makeNdkPkgs "24.0.8215888";
"25" = makeNdkPkgs "25.2.9519653";
"26" = makeNdkPkgs "26.3.11579264";
"21" = makeNdkPkgs "21.0.6113669" pkgs.llvmPackages_14; # "9"
"23" = makeNdkPkgs "23.1.7779620" pkgs.llvmPackages_14; # "12"
# Versions below 24 use a version not available in nixpkgs/old version which could be removed in the near future so use 14 for them as this is only used to get the hardening flags.
"24" = makeNdkPkgs "24.0.8215888" pkgs.llvmPackages_14;
"25" = makeNdkPkgs "25.2.9519653" pkgs.llvmPackages_14;
"26" = makeNdkPkgs "26.3.11579264" pkgs.llvmPackages_17;
}

1
pkgs/top-level/aliases.nix
View File

@ -88,6 +88,7 @@ mapAliases ({
ansible_2_12 = throw "Ansible 2.12 goes end of life in 2023/05 and can't be supported throughout the 23.05 release cycle"; # Added 2023-05-16
ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30
ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
androidndkPkgs_23b = lib.warn "The package set `androidndkPkgs_23b` has been renamed to `androidndkPkgs_23`." androidndkPkgs_23; # Added 2024-07-21
apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12
apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12
apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12

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

@ -4041,7 +4041,7 @@ with pkgs;
androidndkPkgs = androidndkPkgs_26;
androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21";
androidndkPkgs_23b = (callPackage ../development/androidndk-pkgs {})."23b";
androidndkPkgs_23 = (callPackage ../development/androidndk-pkgs {})."23";
androidndkPkgs_24 = (callPackage ../development/androidndk-pkgs {})."24";
androidndkPkgs_25 = (callPackage ../development/androidndk-pkgs {})."25";
androidndkPkgs_26 = (callPackage ../development/androidndk-pkgs {})."26";