diff options
| author | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2011-04-17 08:27:29 +0000 |
|---|---|---|
| committer | Nicolas Pierron <nicolas.b.pierron@gmail.com> | 2011-04-17 08:27:29 +0000 |
| commit | fec06f7196b651473afdcbdf6625cda78a3d5ae5 (patch) | |
| tree | 19c470576d9322d37681cb252a38b350041f9a56 /pkgs/tools/filesystems | |
| parent | 2cab2ce8855a47b64569f1cf37df75e8baf7b114 (diff) | |
| download | nixlib-fec06f7196b651473afdcbdf6625cda78a3d5ae5.tar nixlib-fec06f7196b651473afdcbdf6625cda78a3d5ae5.tar.gz nixlib-fec06f7196b651473afdcbdf6625cda78a3d5ae5.tar.bz2 nixlib-fec06f7196b651473afdcbdf6625cda78a3d5ae5.tar.lz nixlib-fec06f7196b651473afdcbdf6625cda78a3d5ae5.tar.xz nixlib-fec06f7196b651473afdcbdf6625cda78a3d5ae5.tar.zst nixlib-fec06f7196b651473afdcbdf6625cda78a3d5ae5.zip | |
davfs2:
- Use previous version of neon library. - Add patch to find ISDIR macros. svn path=/nixpkgs/trunk/; revision=26865
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/davfs2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/davfs2/isdir.patch | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 1d5f6d8ffcda..8cc212deee47 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -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."; diff --git a/pkgs/tools/filesystems/davfs2/isdir.patch b/pkgs/tools/filesystems/davfs2/isdir.patch new file mode 100644 index 000000000000..ae69b4460f5a --- /dev/null +++ b/pkgs/tools/filesystems/davfs2/isdir.patch @@ -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" |