mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-12 03:56:17 +03:00
serf: fix darwin build
This commit is contained in:
parent
5e89bcae00
commit
b1f5305abd
@ -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";
|
||||
@ -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 = ''
|
||||
@ -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"
|
||||
}" ${
|
||||
|
Loading…
Reference in New Issue
Block a user