Merge pull request #64607 from gloaming/gimp-fix-plugins-exiv2

Fix build for gimp-with-plugins against exiv2 0.27.1
This commit is contained in:
worldofpeace 2019-08-18 17:21:36 -04:00 committed by GitHub
commit 5c430ff744
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 22 deletions

View file

@ -157,17 +157,17 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; {
ufraw = pkgs.ufraw.gimpPlugin;
gimplensfun = pluginDerivation rec {
version = "0.2.4";
version = "unstable-2018-10-21";
name = "gimplensfun-${version}";
src = fetchFromGitHub {
owner = "seebk";
repo = "GIMP-Lensfun";
rev = version;
sha256 = "0zlmp9v732qmzj083mnk5z421s57mnckmpjhiw890wmmwzj2lhxz";
rev = "1c5a5c1534b5faf098b7441f8840d22835592f17";
sha256 = "1jj3n7spkjc63aipwdqsvq9gi07w13bb1v8iqzvxwzld2kxa3c8w";
};
buildInputs = with pkgs; [ lensfun exiv2 ];
buildInputs = with pkgs; [ lensfun gexiv2 ];
installPhase = "
installPlugins gimp-lensfun

View file

@ -1,38 +1,70 @@
{ fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib
, withGimpPlugin ? true, gimp ? null
, libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }:
{ stdenv
, fetchFromGitHub
, autoconf
, automake
, autoreconfHook
, bzip2
, cfitsio
, exiv2
, gettext
, gimp ? null
, gtk2
, gtkimageview
, lcms2
, lensfun
, libjpeg
, libtiff
, perl
, pkgconfig
, zlib
, withGimpPlugin ? true
}:
assert withGimpPlugin -> gimp != null;
stdenv.mkDerivation rec {
name = "ufraw-0.22";
pname = "ufraw";
version = "unstable-2019-06-12";
src = fetchurl {
# XXX: These guys appear to mutate uploaded tarballs!
url = "mirror://sourceforge/ufraw/${name}.tar.gz";
sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp";
# The original ufraw repo is unmaintained and broken;
# this is a fork that collects patches
src = fetchFromGitHub {
owner = "sergiomb2";
repo = "ufraw";
rev = "c65b4237dcb430fb274e4778afaf5df9a18e04e6";
sha256 = "02icn67bsinvgliy62qa6v7gmwgp2sh15jvm8iiz3c7g1h74f0b7";
};
outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
nativeBuildInputs = [ pkgconfig gettext ];
nativeBuildInputs = [ autoconf automake autoreconfHook gettext perl pkgconfig ];
buildInputs = [
gtk2 gtkimageview bzip2 zlib
libjpeg libtiff cfitsio exiv2 lcms2 lensfun
bzip2
cfitsio
exiv2
gtk2
gtkimageview
lcms2
lensfun
libjpeg
libtiff
zlib
] ++ stdenv.lib.optional withGimpPlugin gimp;
configureFlags = [
"--enable-extras"
"--enable-dst-correction"
"--enable-contrast"
"--enable-dst-correction"
] ++ stdenv.lib.optional withGimpPlugin "--with-gimp";
postInstall = stdenv.lib.optionalString withGimpPlugin ''
moveToOutput "lib/gimp" "$gimpPlugin"
'';
meta = {
homepage = http://ufraw.sourceforge.net/;
meta = with stdenv.lib; {
homepage = https://github.com/sergiomb2/ufraw;
description = "Utility to read and manipulate raw images from digital cameras";
@ -46,9 +78,9 @@ stdenv.mkDerivation rec {
the camera's tone curves.
'';
license = stdenv.lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # needs GTK+
maintainers = with maintainers; [ gloaming ];
platforms = with platforms; all;
};
}