diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2006-01-31 14:07:25 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2006-01-31 14:07:25 +0000 |
| commit | f102909a832bf366580d0b80cb24fe8b32c14332 (patch) | |
| tree | 01e87b60efaae97506e5d360cf4690412547b3cb /pkgs | |
| parent | 0e09f5a1e0d8e3e2c8e9d454d693fb713977fd63 (diff) | |
update to libgphoto2 2.1.99. This adds a dependency on libusb and pkgconfig
svn path=/nixpkgs/trunk/; revision=4637
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libgphoto2/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index 83a383ad8da69..6b98694774195 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -1,10 +1,11 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, pkgconfig, libusb}: stdenv.mkDerivation { - name = "libgphoto2-2.1.5"; + name = "libgphoto2-2.1.99"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/libgphoto2-2.1.5.tar.gz; - md5 = "210844f0d88f58842917af6eaff06382"; + url = http://surfnet.dl.sourceforge.net/sourceforge/gphoto/libgphoto2-2.1.99.tar.bz2; + md5 = "3c6d9cb65661915e07491a6f9215d5a9"; }; + buildInputs = [pkgconfig libusb]; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 345349af65c79..f559c299a0adc 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -955,7 +955,7 @@ rec { }; libgphoto2 = (import ../development/libraries/libgphoto2) { - inherit fetchurl stdenv; + inherit fetchurl stdenv pkgconfig libusb; }; popt = (import ../development/libraries/popt) { |