diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-13 12:01:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-13 12:01:13 +0000 |
commit | 631c3d7cb2be3267aae75035600d0b2074ea8248 (patch) | |
tree | 1f0137e8397c927f3d8741e814282315a54005b6 /pkgs/tools/system | |
parent | 1a1e32f023a2a8a928c1f06ed7b714e05c191524 (diff) | |
parent | fca6647ac7c9eacc062df9852ead08bcad2f2007 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r-- | pkgs/tools/system/tree/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 5bfe5c9ac755..0b19bd576874 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -30,12 +30,12 @@ stdenv.mkDerivation rec { preConfigure = '' sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |' + makeFlags+=("CC=$CC") ''; makeFlags = [ "prefix=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" - "CC=$CC" systemFlags ]; |