From d5087119c63ce8820c564e392ddb8e3c1865855e Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 5 Jun 2015 15:49:11 +0200 Subject: [PATCH] cygwin: remove kerberos from builsInputs for serf --- pkgs/development/libraries/serf/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index df8749622be..580460d5fc0 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -8,7 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c"; }; - buildInputs = [ apr scons openssl aprutil zlib kerberos 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 @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { APU="$(echo "${aprutil}"/bin/*-config)" CC="${ if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc" }" ${ - if stdenv.isDarwin then "" else "GSSAPI=\"${kerberos}\"" + if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos}\"" } '';