cadaver: Fix building with current openssl
...by using the already-packaged (newer) version of neon as it is also done for openSUSE[1]. [1] https://build.opensuse.org/package/show/openSUSE:Factory/cadaver
This commit is contained in:
parent
560ee846ac
commit
060efbe394
20
pkgs/tools/networking/cadaver/configure.patch
Normal file
20
pkgs/tools/networking/cadaver/configure.patch
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
--- a/configure.orig
|
||||||
|
+++ b/configure
|
||||||
|
@@ -9595,7 +9595,7 @@ fi
|
||||||
|
$as_echo "$ne_cv_lib_neon" >&6; }
|
||||||
|
if test "$ne_cv_lib_neon" = "yes"; then
|
||||||
|
ne_cv_lib_neonver=no
|
||||||
|
- for v in 27 28 29; do
|
||||||
|
+ for v in 27 28 29 30 31; do
|
||||||
|
case $ne_libver in
|
||||||
|
0.$v.*) ne_cv_lib_neonver=yes ;;
|
||||||
|
esac
|
||||||
|
@@ -10328,7 +10328,7 @@ fi
|
||||||
|
$as_echo "$ne_cv_lib_neon" >&6; }
|
||||||
|
if test "$ne_cv_lib_neon" = "yes"; then
|
||||||
|
ne_cv_lib_neonver=no
|
||||||
|
- for v in 27 28 29; do
|
||||||
|
+ for v in 27 28 29 30 31; do
|
||||||
|
case $ne_libver in
|
||||||
|
0.$v.*) ne_cv_lib_neonver=yes ;;
|
||||||
|
esac
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchurl, fetchpatch, openssl, readline }:
|
{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "cadaver-0.23.3";
|
name = "cadaver-0.23.3";
|
||||||
|
@ -14,11 +14,15 @@ stdenv.mkDerivation rec {
|
||||||
name = "disable-sslv2.patch";
|
name = "disable-sslv2.patch";
|
||||||
sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr";
|
sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr";
|
||||||
})
|
})
|
||||||
|
# Cadaver also works with newer versions of neon than stated
|
||||||
|
# in the configure script
|
||||||
|
./configure.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = [ "--with-ssl" "--with-readline" ];
|
configureFlags = [ "--with-ssl" "--with-readline" ];
|
||||||
|
|
||||||
buildInputs = [ openssl readline ];
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
buildInputs = [ neon readline zlib ];
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "A command-line WebDAV client";
|
description = "A command-line WebDAV client";
|
||||||
|
|
|
@ -3116,9 +3116,7 @@ in
|
||||||
|
|
||||||
cabextract = callPackage ../tools/archivers/cabextract { };
|
cabextract = callPackage ../tools/archivers/cabextract { };
|
||||||
|
|
||||||
cadaver = callPackage ../tools/networking/cadaver {
|
cadaver = callPackage ../tools/networking/cadaver { };
|
||||||
openssl = openssl_1_0_2;
|
|
||||||
};
|
|
||||||
|
|
||||||
davix = callPackage ../tools/networking/davix { };
|
davix = callPackage ../tools/networking/davix { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue