JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

davfs2: Fix build

Browse Source 
The configure script checks for an old version of neon. Let's bump the bounds since neon 0.31 is API compatible.
This commit is contained in:
Jan Tojnar 2020-04-04 09:19:51 +02:00
parent 7c0a76d85e
commit faa2f094e9
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/tools/filesystems/davfs2/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv { stdenv
, fetchurl , fetchurl
, fetchpatch
, autoreconfHook
, neon , neon
, procps , procps
, substituteAll , substituteAll
@ -14,6 +16,10 @@ stdenv.mkDerivation rec {
sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21"; sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21";
}; };
nativeBuildInputs = [
autoreconfHook # neon-0.31.patch requires reconfiguration
];
buildInputs = [ neon zlib ]; buildInputs = [ neon zlib ];
patches = [ patches = [
@ -23,6 +29,15 @@ stdenv.mkDerivation rec {
src = ./0001-umount_davfs-substitute-ps-command.patch; src = ./0001-umount_davfs-substitute-ps-command.patch;
ps = "${procps}/bin/ps"; 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" ]; configureFlags = [ "--sysconfdir=/etc" ];