diff options
| author | Peter Simons <simons@cryp.to> | 2011-07-24 19:36:03 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-07-24 19:36:03 +0000 |
| commit | 31d1abd4a16f5f12a0f8e69436227b0349319b16 (patch) | |
| tree | 5f48493d5c9694b81392866d90ff10cf209f7586 /pkgs/tools/system/tree | |
| parent | 3415f0f088205c8aef34f45b22a0b06341fe1820 (diff) | |
| download | nixpkgs-31d1abd4a16f5f12a0f8e69436227b0349319b16.tar nixpkgs-31d1abd4a16f5f12a0f8e69436227b0349319b16.tar.gz nixpkgs-31d1abd4a16f5f12a0f8e69436227b0349319b16.tar.bz2 nixpkgs-31d1abd4a16f5f12a0f8e69436227b0349319b16.tar.lz nixpkgs-31d1abd4a16f5f12a0f8e69436227b0349319b16.tar.xz nixpkgs-31d1abd4a16f5f12a0f8e69436227b0349319b16.tar.zst nixpkgs-31d1abd4a16f5f12a0f8e69436227b0349319b16.zip | |
tree: OBJS+=... doesn't work on the make command line, use EXTRA_OBJS variable instead
svn path=/nixpkgs/trunk/; revision=27919
Diffstat (limited to 'pkgs/tools/system/tree')
| -rw-r--r-- | pkgs/tools/system/tree/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 900108d3dfe..8e74f12f157 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 |