public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serf: fix darwin build

Browse Source
This commit is contained in:
Robin Gloster 2017-08-09 23:53:08 +02:00
parent 5e89bcae00
commit b1f5305abd
No known key found for this signature in database
GPG Key ID: 5E4C836C632C2882
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/serf/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
, pkgconfig, gnused, expat, openldap }: , pkgconfig, gnused, expat, openldap, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "serf-1.3.9"; name = "serf-1.3.9";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ apr scons openssl aprutil zlib ] buildInputs = [ apr scons openssl aprutil zlib libiconv ]
++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
postPatch = '' postPatch = ''
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildPhase = '' buildPhase = ''
scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \ 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="${ APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc" if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
}" ${ }" ${