summary refs log tree commit diff
path: root/pkgs/development/libraries/serf
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-08-08 20:33:33 +0200
committerRobin Gloster <mail@glob.in>2017-08-09 14:46:38 +0200
commitf4ca99166a8b270b62ed81949ebc0612478fa716 (patch)
tree44ab9cb0274c4afda1066bf8d597f0499c19853e /pkgs/development/libraries/serf
parent0ff782e14114e71a76d400274dc4c95c980477de (diff)
downloadnixpkgs-f4ca99166a8b270b62ed81949ebc0612478fa716.tar
nixpkgs-f4ca99166a8b270b62ed81949ebc0612478fa716.tar.gz
nixpkgs-f4ca99166a8b270b62ed81949ebc0612478fa716.tar.bz2
nixpkgs-f4ca99166a8b270b62ed81949ebc0612478fa716.tar.lz
nixpkgs-f4ca99166a8b270b62ed81949ebc0612478fa716.tar.xz
nixpkgs-f4ca99166a8b270b62ed81949ebc0612478fa716.tar.zst
nixpkgs-f4ca99166a8b270b62ed81949ebc0612478fa716.zip
serf: fix build
Diffstat (limited to 'pkgs/development/libraries/serf')
-rw-r--r--pkgs/development/libraries/serf/default.nix23
1 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index c10a355dee0..3fab42e3eb5 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos, pkgconfig, gnused }:
+{ stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos
+, pkgconfig, gnused, expat, openldap }:
 
 stdenv.mkDerivation rec {
   name = "serf-1.3.9";
@@ -8,18 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ apr scons openssl aprutil zlib ]
-    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos
-    ++ [ pkgconfig ];
-
-  configurePhase = ''
-    ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' -i SConstruct
-    ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' -i SConstruct
-    ${gnused}/bin/sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' -i SConstruct
+    ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
+
+  postPatch = ''
+    sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' \
+        -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' \
+        -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' \
+        -e 's,$OPENSSL/lib,${openssl.out}/lib,' \
+        -e 's,$OPENSSL/include,${openssl.dev}/include,' \
+      -i SConstruct
   '';
 
   buildPhase = ''
-    scons PREFIX="$out" OPENSSL="${openssl.dev}" ZLIB="${zlib.dev}" APR="$(echo "${apr.dev}"/bin/*-config)" \
+    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" \
         APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
           if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
         }" ${