ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-30 23:34:12 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #200159 from veprbl/pr/davix_fixes

Browse Source 
davix: fix on darwin
This commit is contained in:
Dmitry Kalinkin 2022-11-08 15:59:13 -05:00 committed by GitHub
commit de033fa066
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/networking/davix/default.nix
View File

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -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; };