BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

davfs2:

Browse source 
- Use previous version of neon library.
- Add patch to find ISDIR macros.

svn path=/nixpkgs/trunk/; revision=26865
This commit is contained in:
Nicolas Pierron 2011-04-17 08:27:29 +00:00
parent 2cab2ce885
commit fec06f7196
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/tools/filesystems/davfs2/default.nix
View file

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ neon zlib ];
patches = [ ./davfs2-install.patch ];
patches = [ ./davfs2-install.patch ./isdir.patch ];
meta = {
longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";

30
pkgs/tools/filesystems/davfs2/isdir.patch Normal file
View file

@ -0,0 +1,30 @@
diff -ur davfs2-1.4.5-old/src/dav_coda.c davfs2-1.4.5-new/src/dav_coda.c
--- davfs2-1.4.5-old/src/dav_coda.c 2009-06-04 20:30:32.000000000 +0200
+++ davfs2-1.4.5-new/src/dav_coda.c 2011-02-09 19:51:22.260530572 +0100
@@ -52,6 +52,10 @@
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
#include "defaults.h"
#include "mount_davfs.h"
diff -ur davfs2-1.4.5-old/src/dav_fuse.c davfs2-1.4.5-new/src/dav_fuse.c
--- davfs2-1.4.5-old/src/dav_fuse.c 2009-06-30 20:06:44.000000000 +0200
+++ davfs2-1.4.5-new/src/dav_fuse.c 2011-02-09 19:52:23.938220524 +0100
@@ -41,6 +41,12 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#include "defaults.h"
#include "mount_davfs.h"

2
pkgs/top-level/all-packages.nix
View file

@ -529,7 +529,7 @@ let
dar = callPackage ../tools/archivers/dar { };
davfs2 = callPackage ../tools/filesystems/davfs2 {
neon = neon028;
neon = neon029;
};
dcraw = callPackage ../tools/graphics/dcraw { };