about summary refs log tree commit diff
path: root/pkgs/development/libraries/serf
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-05-23 00:55:43 +0300
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-05-23 01:14:51 +0300
commitaedc169d7fbdc50131f6b6a4c3ccec4376f489fa (patch)
tree0099324bb64152a17ce32651f6f63f4b4436637b /pkgs/development/libraries/serf
parent20c2fd73caa4a5438736aa8e649bc842ef99f5f2 (diff)
serf: Simplify
Diffstat (limited to 'pkgs/development/libraries/serf')
-rw-r--r--pkgs/development/libraries/serf/default.nix8
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 81dff49571dab..62d8bcccfe36d 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -17,17 +17,13 @@ stdenv.mkDerivation rec {
     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}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \
-      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"
-        }" ${
+      LINKFLAGS="-L${zlib.out}/lib -L${openldap}/lib -L${libiconv}/lib" \
+        APU="$(echo "${aprutil.dev}"/bin/*-config)" CC=$CC ${
           if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos.dev}\""
         }
   '';