Skip to content

Commit

Permalink
serf: fix darwin build
Browse files Browse the repository at this point in the history
  • Loading branch information
globin committed Aug 9, 2017
1 parent 5e89bca commit b1f5305
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/development/libraries/serf/default.nix
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
, pkgconfig, gnused, expat, openldap }:
, pkgconfig, gnused, expat, openldap, libiconv }:

stdenv.mkDerivation rec {
name = "serf-1.3.9";
Expand All @@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};

nativeBuildInputs = [ pkgconfig ];
buildInputs = [ apr scons openssl aprutil zlib ]
buildInputs = [ apr scons openssl aprutil zlib libiconv ]
++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;

postPatch = ''
Expand All @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

buildPhase = ''
scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \
LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib" \
LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib -L${libiconv}/lib" \
APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
}" ${
Expand Down

0 comments on commit b1f5305

Please sign in to comment.