diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-06-15 18:04:46 -0700 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-06-15 19:36:18 -0700 |
commit | cc22c861e805952b75941d467d826a70a7063a80 (patch) | |
tree | 4351e9d46b9a316348d9f751315c833aca6fe39f /pkgs/development/libraries/glibc | |
parent | ddfda1497e9c63aa633d323afea85cfb7e71d280 (diff) |
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`
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r-- | pkgs/development/libraries/glibc/common.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index de9867f41d0de..f98c0eb1c3487 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -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 { |