From 31d1abd4a16f5f12a0f8e69436227b0349319b16 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Jul 2011 19:36:03 +0000 Subject: [PATCH] tree: OBJS+=... doesn't work on the make command line, use EXTRA_OBJS variable instead svn path=/nixpkgs/trunk/; revision=27919 --- pkgs/tools/system/tree/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 900108d3dfed..8e74f12f1576 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -10,9 +10,9 @@ let if stdenv.isDarwin then '' CFLAGS="-O2 -Wall -fomit-frame-pointer -no-cpp-precomp" LDFLAGS= - OBJS+=strverscmp.o + EXTRA_OBJS=strverscmp.o '' else - ""; + ""; # use linux flags by default in stdenv.mkDerivation { name = "tree-${version}"; @@ -23,6 +23,7 @@ stdenv.mkDerivation { }; configurePhase = '' + sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |' makeFlagsArray=( prefix=$out MANDIR=$out/share/man/man1