Author: simons
Date: Sun Jul 24 19:36:03 2011
New Revision: 27919
URL: https://svn.nixos.org/websvn/nix/?rev=27919&sc=1
Log:
tree: OBJS+=... doesn't work on the make command line, use EXTRA_OBJS variable
instead
Modified:
nixpkgs/trunk/pkgs/tools/system/tree/default.nix
Modified: nixpkgs/trunk/pkgs/tools/system/tree/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/system/tree/default.nix Sun Jul 24 19:15:09
2011 (r27918)
+++ nixpkgs/trunk/pkgs/tools/system/tree/default.nix Sun Jul 24 19:36:03
2011 (r27919)
@@ -10,9 +10,9 @@
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 @@
};
configurePhase = ''
+ sed -i Makefile -e 's|^OBJS=|OBJS=$(EXTRA_OBJS) |'
makeFlagsArray=(
prefix=$out
MANDIR=$out/share/man/man1
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
