glibc: allow users of glibc/common.nix to override makeFlags

This commit allows to include `makeFlags` in a glibc derivation
without clobbering the flags from `common.nix`
This commit is contained in:
Adam Joseph 2023-06-15 18:04:46 -07:00
parent 0d726f08b6
commit 238b793373

View file

@ -161,7 +161,7 @@ stdenv.mkDerivation ({
++ lib.optional withGd "--with-gd"
++ lib.optional (!withLibcrypt) "--disable-crypt";
makeFlags = [
makeFlags = (args.makeFlags or []) ++ [
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
];
@ -196,7 +196,7 @@ stdenv.mkDerivation ({
passthru = { inherit version; minorRelease = version; };
}
// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" ]) //
// (removeAttrs args [ "withLinuxHeaders" "withGd" "postInstall" "makeFlags" ]) //
{
src = fetchurl {