swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 21:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

libgphoto: Switch to Github, allow building from repo.

Browse source 
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 #103997.
This commit is contained in:
Niklas Hambüchen 2020-11-16 22:40:29 +01:00
parent c75b9da41d
commit 25b7b8895c
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/libraries/libgphoto2/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
name = "libgphoto2-${meta.version}"; pname = "libgphoto2";
version = "2.5.23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gphoto"; owner = "gphoto";
repo = "libgphoto2"; repo = "libgphoto2";
rev = meta.tag; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2"; sha256 = "1sc2ycx11khf0qzp1cqxxx1qymv6bjfbkx3vvbwz6wnbyvsigxz2";
}; };
patches = []; patches = [];
nativeBuildInputs = [ pkgconfig gettext autoreconfHook ]; nativeBuildInputs = [
buildInputs = [ libtool libjpeg libusb1 ]; autoreconfHook
pkgconfig
gettext
libtool
];
buildInputs = [
libjpeg
libusb1
];
# These are mentioned in the Requires line of libgphoto's pkg-config file. # These are mentioned in the Requires line of libgphoto's pkg-config file.
propagatedBuildInputs = [ libexif ]; propagatedBuildInputs = [ libexif ];
@ -33,8 +48,6 @@ stdenv.mkDerivation rec {
MTP, and other vendor specific protocols for controlling and transferring data MTP, and other vendor specific protocols for controlling and transferring data
from digital cameras. from digital cameras.
''; '';
version = "2.5.23";
tag = "libgphoto2-2_5_23-release";
# XXX: the homepage claims LGPL, but several src files are lgpl21Plus # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
license = stdenv.lib.licenses.lgpl21Plus; license = stdenv.lib.licenses.lgpl21Plus;
platforms = with stdenv.lib.platforms; unix; platforms = with stdenv.lib.platforms; unix;