Skip to content

Commit c8af6d6

Browse files
committed
Merge remote-tracking branch 'origin/master' into hkm/nixpkgs-update
2 parents 8956daa + b6b1909 commit c8af6d6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

flake.lock

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

overlays/android.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ _final: prev: prev.lib.optionalAttrs prev.stdenv.hostPlatform.isAndroid ({
2323
gmp6 = (prev.gmp6.override { withStatic = true; }).overrideAttrs(_: {
2424
hardeningDisable = [ "fortify" "stackprotector" "format" ];
2525
});
26-
}) // prev.lib.optionalAttrs prev.stdenv.targetPlatform.isAndroid ({
26+
}) // prev.lib.optionalAttrs (prev.stdenv.targetPlatform.isAndroid && (!prev.stdenv.hostPlatform.useAndroidPrebuilt)) ({
2727
bionic = prev.bionic.override { enableStatic = true; };
2828
})

0 commit comments

Comments
 (0)