diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-03-07 15:51:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 15:51:43 +0000 |
| commit | bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10 (patch) | |
| tree | a5eb3a0e3d56cb21529273eab28bb95ac8d3d4ee /pkgs | |
| parent | c00f738dbb3aa30be3898f7aa3b7ac6d8889f6f0 (diff) | |
| parent | 060efbe394e1633b8ff6e7aaf23a06cfdc53df1c (diff) | |
| download | nixpkgs-bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10.tar nixpkgs-bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10.tar.gz nixpkgs-bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10.tar.bz2 nixpkgs-bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10.tar.lz nixpkgs-bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10.tar.xz nixpkgs-bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10.tar.zst nixpkgs-bdfd32bc0f6c09ed967b7e5db64d6baefe2e4f10.zip | |
Merge pull request #115329 from clkamp/cadaver-neon
cadaver: Fix building with current openssl
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/cadaver/configure.patch | 20 | ||||
| -rw-r--r-- | pkgs/tools/networking/cadaver/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 27 insertions, 5 deletions
diff --git a/pkgs/tools/networking/cadaver/configure.patch b/pkgs/tools/networking/cadaver/configure.patch new file mode 100644 index 00000000000..b618099b371 --- /dev/null +++ b/pkgs/tools/networking/cadaver/configure.patch @@ -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 diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 84265d3f4b7..70c7972bd65 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, openssl, readline }: +{ lib, stdenv, fetchurl, fetchpatch, neon, pkg-config, readline, zlib}: stdenv.mkDerivation rec { name = "cadaver-0.23.3"; @@ -14,11 +14,15 @@ stdenv.mkDerivation rec { name = "disable-sslv2.patch"; sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; }) + # Cadaver also works with newer versions of neon than stated + # in the configure script + ./configure.patch ]; configureFlags = [ "--with-ssl" "--with-readline" ]; - buildInputs = [ openssl readline ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ neon readline zlib ]; meta = with lib; { description = "A command-line WebDAV client"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aee51d878a..c0c508820e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3116,9 +3116,7 @@ in cabextract = callPackage ../tools/archivers/cabextract { }; - cadaver = callPackage ../tools/networking/cadaver { - openssl = openssl_1_0_2; - }; + cadaver = callPackage ../tools/networking/cadaver { }; davix = callPackage ../tools/networking/davix { }; |