From 5160daf97925551b014576c894d7e4f0ad99350d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 8 Nov 2022 02:30:56 -0500 Subject: [PATCH 1/2] davix: never use vendored curl It is still a mandatory dependency: https://github.com/cern-fts/davix/blob/23a591d5607a039f002c5df9712126bfb1e40fb5/CMakeLists.txt#L117-L124 --- pkgs/tools/networking/davix/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 2b9d204772e8..94f01f72167d 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -11,10 +11,6 @@ , curl , gsoap , 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 @@ -37,7 +33,8 @@ stdenv.mkDerivation rec { libxml2 boost libuuid - ] ++ lib.optional (defaultToLibcurl && !useEmbeddedLibcurl) curl + curl + ] ++ lib.optional (enableThirdPartyCopy) gsoap; # using the url below since the github release page states @@ -56,7 +53,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TOOLS=${boolToUpper enableTools}" - "-DEMBEDDED_LIBCURL=${boolToUpper useEmbeddedLibcurl}" + "-DEMBEDDED_LIBCURL=false" "-DLIBCURL_BACKEND_BY_DEFAULT=${boolToUpper defaultToLibcurl}" "-DENABLE_IPV6=${boolToUpper enableIpv6}" "-DENABLE_TCP_NODELAY=${boolToUpper enableTcpNodelay}" From 92dbff970f10cf97cc33b1a52cb19b05bd58f578 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 8 Nov 2022 02:35:53 -0500 Subject: [PATCH 2/2] davix: fix on darwin --- pkgs/tools/networking/davix/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 94f01f72167d..9087e1864bf5 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -10,6 +10,7 @@ , libuuid , curl , gsoap +, Security , enableTools ? true # Use libcurl instead of libneon # Note that the libneon used is bundled in the project @@ -32,9 +33,10 @@ stdenv.mkDerivation rec { openssl libxml2 boost - libuuid 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 @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_TOOLS=${boolToUpper enableTools}" - "-DEMBEDDED_LIBCURL=false" + "-DEMBEDDED_LIBCURL=OFF" "-DLIBCURL_BACKEND_BY_DEFAULT=${boolToUpper defaultToLibcurl}" "-DENABLE_IPV6=${boolToUpper enableIpv6}" "-DENABLE_TCP_NODELAY=${boolToUpper enableTcpNodelay}" @@ -61,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 8e0eae0abd0d..0e5c3a58e4ea 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; };