diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-11-08 15:59:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-08 15:59:13 -0500 |
| commit | de033fa066c8a78574243699491a88a89738dfdd (patch) | |
| tree | fb0e1825e7556f2b1a4b41e90fa34ce01dfefd21 /pkgs | |
| parent | 9f1f990aee8ca8bc847bf41feabe0d91d8a59dc4 (diff) | |
| parent | 92dbff970f10cf97cc33b1a52cb19b05bd58f578 (diff) | |
Merge pull request #200159 from veprbl/pr/davix_fixes
davix: fix on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/davix/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 2b9d204772e81..9087e1864bf51 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -10,11 +10,8 @@ , libuuid , curl , gsoap +, Security , enableTools ? true - # Build the bundled libcurl - # and, if defaultToLibCurl, - # use instead of an external one -, useEmbeddedLibcurl ? true # Use libcurl instead of libneon # Note that the libneon used is bundled in the project # See https://github.com/cern-fts/davix/issues/23 @@ -36,8 +33,10 @@ stdenv.mkDerivation rec { openssl libxml2 boost - libuuid - ] ++ lib.optional (defaultToLibcurl && !useEmbeddedLibcurl) curl + curl + ] + ++ lib.optional stdenv.isDarwin Security + ++ lib.optional (!stdenv.isDarwin) libuuid ++ lib.optional (enableThirdPartyCopy) gsoap; # using the url below since the github release page states @@ -56,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TOOLS=${boolToUpper enableTools}" - "-DEMBEDDED_LIBCURL=${boolToUpper useEmbeddedLibcurl}" + "-DEMBEDDED_LIBCURL=OFF" "-DLIBCURL_BACKEND_BY_DEFAULT=${boolToUpper defaultToLibcurl}" "-DENABLE_IPV6=${boolToUpper enableIpv6}" "-DENABLE_TCP_NODELAY=${boolToUpper enableTcpNodelay}" @@ -64,7 +63,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Toolkit for Http-based file management"; longDescription = "Davix is a toolkit designed for file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05d687b152e39..b70b510d21f5c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5202,7 +5202,9 @@ with pkgs; cadaver = callPackage ../tools/networking/cadaver { }; - davix = callPackage ../tools/networking/davix { }; + davix = callPackage ../tools/networking/davix { + inherit (darwin.apple_sdk.frameworks) Security; + }; davix-copy = davix.override { enableThirdPartyCopy = true; }; |