svn merge ^/nixpkgs/trunk

There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
parent 232da3a29d e9974606a5
commit 5144a19987
63 changed files with 589 additions and 575 deletions
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, fuse, libzip, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "fuse-zip-0.2.13";
+  
+  src = fetchurl {
+    url = "http://fuse-zip.googlecode.com/files/${name}.tar.gz";
+    sha1 = "9cfa00e38a59d4e06fd47bfaca75ad5e299ecc6b";
+  };
+
+  buildInputs = [ pkgconfig fuse libzip zlib ];
+
+  makeFlags = "INSTALLPREFIX=$(out)";
+  
+  meta = {
+    homepage = http://code.google.com/p/fuse-zip/;
+    description = "A FUSE-based filesystem that allows read and write access to ZIP files";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3Plus;
+  };
+}