about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorArmijn Hemel <armijn@gpl-violations.org>2006-01-31 14:22:08 +0000
committerArmijn Hemel <armijn@gpl-violations.org>2006-01-31 14:22:08 +0000
commit6d76f21f43e20fcedac82028c6085edb965d475e (patch)
tree1adc07d2da38c84b4a1d6b69dbbc21021d1f7f8d /pkgs
parentf102909a832bf366580d0b80cb24fe8b32c14332 (diff)
add gphoto2
svn path=/nixpkgs/trunk/; revision=4638
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/misc/gphoto2/default.nix10
-rw-r--r--pkgs/system/all-packages-generic.nix4
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
new file mode 100644
index 0000000000000..df13dbf6ecc43
--- /dev/null
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt}:
+
+stdenv.mkDerivation {
+  name = "gphoto2-2.1.99";
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/gphoto2-2.1.99.tar.bz2;
+    md5 = "549a9dfae6910ab6456b194ea86b55a2";
+  };
+  buildInputs = [pkgconfig libgphoto2 libexif popt];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index f559c299a0adc..551be095a01ad 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1977,6 +1977,10 @@ rec {
     inherit fetchurl stdenv ncurses;
   };
 
+  gphoto2 = (import ../applications/misc/gphoto2) {
+    inherit fetchurl stdenv pkgconfig libgphoto2 libexif popt;
+  };
+
   xchm = (import ../applications/misc/xchm) {
     inherit fetchurl stdenv wxGTK chmlib;
   };