Merge pull request #8658 from benley/iftop-darwin

iftop: fix Darwin build
This commit is contained in:
Arseniy Seroka 2015-07-06 14:27:13 +03:00
commit 6d99ecf300

View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
# Explicitly link against libgcc_s, to work around the infamous # Explicitly link against libgcc_s, to work around the infamous
# "libgcc_s.so.1 must be installed for pthread_cancel to work". # "libgcc_s.so.1 must be installed for pthread_cancel to work".
LDFLAGS = "-lgcc_s"; LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
preConfigure = '' preConfigure = ''
cp ${automake}/share/automake*/config.{sub,guess} config cp ${automake}/share/automake*/config.{sub,guess} config
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
''; '';
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
homepage = http://ex-parrot.com/pdw/iftop/; homepage = http://ex-parrot.com/pdw/iftop/;
platforms = platforms.linux; platforms = platforms.unix;
maintainers = [ maintainers.mornfall ]; maintainers = [ maintainers.mornfall ];
}; };
} }