Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs

Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-03-08 18:22:13 -05:00
commit 064155ad38

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
doCheck = true;
preCheck = ''
checkFlagsArray=(LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs")
checkFlagsArray=(CPPFLAGS="-I../lib" LDFLAGS="-L../src/.libs -Wl,-rpath=../src/.libs")
'';
meta = {