diff options
author | Niklas Hambüchen <mail@nh2.me> | 2020-11-16 22:41:52 +0100 |
---|---|---|
committer | Niklas Hambüchen <mail@nh2.me> | 2020-11-16 22:42:56 +0100 |
commit | 58957e42be44ac6e4dce883c20f21d458f9bdbbb (patch) | |
tree | bea7f4504506ea69051bd67b24841bf48d286768 /pkgs/applications | |
parent | 25b7b8895c72184c0a251c47d584d1e9f5af754a (diff) |
gphoto2: Switch to Github, allow building from repo.
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.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/misc/gphoto2/default.nix | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index cdfbe3f6dc1f..7bda292a4cba 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -1,17 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, libgphoto2, libexif, popt, gettext -, libjpeg, readline, libtool +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +, gettext +, libexif +, libgphoto2 +, libjpeg +, libtool +, popt +, readline }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.26"; + pname = "gphoto2"; + version = "2.5.26"; - src = fetchurl { - url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn"; + src = fetchFromGitHub { + owner = "gphoto"; + repo = "gphoto2"; + rev = "v${version}"; + sha256 = "1w01j3qvjl2nlfs38rnsmjvn3r0r2xf7prxz1i6yarbpj3fzwqqc"; }; - nativeBuildInputs = [ pkgconfig gettext libtool ]; - buildInputs = [ libgphoto2 libexif popt libjpeg readline ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + gettext + libtool + ]; + + buildInputs = [ + libexif + libgphoto2 + libjpeg + popt + readline + ]; meta = with stdenv.lib; { description = "A ready to use set of digital camera software applications"; |