diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-06-15 18:04:46 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-06-15 20:14:29 -0700 |
| commit | 238b793373ab07e40a70cc0834c30c28859a8720 (patch) | |
| tree | d4b9d90585418631ed103eaf4d3a90de0cfc320c /pkgs/development/libraries/glibc/common.nix | |
| parent | 0d726f08b652eb225c1da0b2085704d44096ac26 (diff) | |
| download | nixpkgs-238b793373ab07e40a70cc0834c30c28859a8720.tar nixpkgs-238b793373ab07e40a70cc0834c30c28859a8720.tar.gz nixpkgs-238b793373ab07e40a70cc0834c30c28859a8720.tar.bz2 nixpkgs-238b793373ab07e40a70cc0834c30c28859a8720.tar.lz nixpkgs-238b793373ab07e40a70cc0834c30c28859a8720.tar.xz nixpkgs-238b793373ab07e40a70cc0834c30c28859a8720.tar.zst nixpkgs-238b793373ab07e40a70cc0834c30c28859a8720.zip | |
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/common.nix')
| -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 de9867f41d0..f98c0eb1c34 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 { |