diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-04 09:19:51 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-04 09:19:51 +0200 |
| commit | faa2f094e9384f00abe076a9255d6810133b5291 (patch) | |
| tree | e55694f07c1594ab4341622eaf4700d606838206 /pkgs/tools | |
| parent | 7c0a76d85e6b57924e73ad152387c2e49c674242 (diff) | |
| download | nixlib-faa2f094e9384f00abe076a9255d6810133b5291.tar nixlib-faa2f094e9384f00abe076a9255d6810133b5291.tar.gz nixlib-faa2f094e9384f00abe076a9255d6810133b5291.tar.bz2 nixlib-faa2f094e9384f00abe076a9255d6810133b5291.tar.lz nixlib-faa2f094e9384f00abe076a9255d6810133b5291.tar.xz nixlib-faa2f094e9384f00abe076a9255d6810133b5291.tar.zst nixlib-faa2f094e9384f00abe076a9255d6810133b5291.zip | |
davfs2: Fix build
The configure script checks for an old version of neon. Let's bump the bounds since neon 0.31 is API compatible.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/filesystems/davfs2/default.nix | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 366db929f582..13f21ae8b58a 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, fetchpatch +, autoreconfHook , neon , procps , substituteAll @@ -14,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21"; }; + nativeBuildInputs = [ + autoreconfHook # neon-0.31.patch requires reconfiguration + ]; + buildInputs = [ neon zlib ]; patches = [ @@ -23,6 +29,15 @@ stdenv.mkDerivation rec { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; }) + + # Fix build with neon 0.31 + # http://savannah.nongnu.org/bugs/?58101 + (fetchpatch { + name = "neon-0.31.patch"; + url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737"; + sha256 = "EtQfcstWkn8AcbZo93midGt076gq20AvGGJyQ3FO/YQ="; + extraPrefix = ""; # empty means add 'a/' and 'b/' + }) ]; configureFlags = [ "--sysconfdir=/etc" ]; |