forked from mirrors/nixpkgs
gphoto*: update for changed libgphoto version
This commit is contained in:
parent
3da96b38cd
commit
7a25aa94cd
|
@ -3,16 +3,16 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gphoto2-2.4.14";
|
||||
|
||||
name = "gphoto2-2.5.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
|
||||
sha256 = "08x1p8xhl65r79a6gn1fi63z1lspd5j55l05diiyzcwfxvqwsm47";
|
||||
sha256 = "12zn677fvw1bmx70pg0vck2vrvkiy7hx1wzlwf6k23mhdnm4ipad";
|
||||
};
|
||||
|
||||
|
||||
nativeBuildInputs = [ pkgconfig gettext ];
|
||||
buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
|
||||
|
||||
|
||||
meta = {
|
||||
description = "a ready to use set of digital camera software applications";
|
||||
longDescription = ''
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
a :
|
||||
let
|
||||
a :
|
||||
let
|
||||
fetchurl = a.fetchurl;
|
||||
s = import ./src-info-for-gphotofs.nix;
|
||||
|
||||
version = a.lib.attrByPath ["version"] s.version a;
|
||||
version = a.lib.attrByPath ["version"] s.version a;
|
||||
buildInputs = with a; [
|
||||
libgphoto2 fuse pkgconfig glib
|
||||
libgphoto2 fuse pkgconfig glib libtool
|
||||
];
|
||||
in
|
||||
rec {
|
||||
|
@ -19,7 +19,7 @@ rec {
|
|||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["doConfigure" "doMakeInstall"];
|
||||
|
||||
|
||||
name = "gphoto2fs-" + version;
|
||||
meta = {
|
||||
description = "Fuse FS to mount a digital camera";
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
rec {
|
||||
advertisedUrl="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2";
|
||||
version = "0.4.0";
|
||||
url="http://downloads.sourceforge.net/gphoto/files/gphotofs/0.4.0/gphotofs-0.4.0.tar.bz2";
|
||||
hash = "07zxnawkyzy6np9zas6byp9ksjkbi16d11zqrznqarfkf3fkg3yq";
|
||||
advertisedUrl="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
|
||||
version = "0.5.0";
|
||||
url="mirror://sourceforge/gphoto/gphotofs/0.5.0/gphotofs-0.5.tar.bz2";
|
||||
hash = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7";
|
||||
}
|
||||
|
|
|
@ -7185,7 +7185,7 @@ let
|
|||
gphoto2 = callPackage ../applications/misc/gphoto2 { };
|
||||
|
||||
gphoto2fs = builderDefsPackage ../applications/misc/gphoto2/gphotofs.nix {
|
||||
inherit libgphoto2 fuse pkgconfig glib;
|
||||
inherit libgphoto2 fuse pkgconfig glib libtool;
|
||||
};
|
||||
|
||||
graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
|
||||
|
|
Loading…
Reference in a new issue