Skip to content

Commit

Permalink
libgphoto: Switch to Github, allow building from repo.
Browse files Browse the repository at this point in the history
Github is where upstream's development happens now,
and building from repo makes adding patches and overriding the commit easier.

Also use pname+version, see NixOS#103997.
  • Loading branch information
nh2 committed Nov 16, 2020
1 parent c75b9da commit 25b7b88
Showing 1 changed file with 20 additions and 7 deletions.
27 changes: 20 additions & 7 deletions pkgs/development/libraries/libgphoto2/default.nix
Original file line number Diff line number Diff line change
@@ -1,19 +1,34 @@
{ stdenv, fetchFromGitHub, pkgconfig, libusb1, libtool, libexif, libjpeg, gettext, autoreconfHook }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gettext
, libusb1
, libtool
, libexif
, libjpeg
}:

stdenv.mkDerivation rec {
name = "libgphoto2-${meta.version}";
pname = "libgphoto2";
version = "2.5.23";

src = fetchFromGitHub {
owner = "gphoto";
repo = "libgphoto2";
rev = meta.tag;
rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2";
};

patches = [];

nativeBuildInputs = [ pkgconfig gettext autoreconfHook ];
buildInputs = [ libtool libjpeg libusb1 ];
nativeBuildInputs = [
autoreconfHook
pkgconfig
gettext
libtool
];

buildInputs = [
libjpeg
libusb1
];

# These are mentioned in the Requires line of libgphoto's pkg-config file.
propagatedBuildInputs = [ libexif ];
Expand All @@ -33,8 +48,6 @@ stdenv.mkDerivation rec {
MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras.
'';
version = "2.5.23";
tag = "libgphoto2-2_5_23-release";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix;
Expand Down

0 comments on commit 25b7b88

Please sign in to comment.