mypaint: 1.1.0 -> 1.2.1 (#27004)

This commit is contained in:
Jan Tojnar 2017-07-03 21:21:50 +02:00 committed by Pascal Wittmann
parent c64d8eaaea
commit e02d40c33e
2 changed files with 21 additions and 19 deletions

View File

@ -267,6 +267,7 @@
jpierre03 = "Jean-Pierre PRUNARET <nix@prunetwork.fr>";
jpotier = "Martin Potier <jpo.contributes.to.nixos@marvid.fr>";
jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
jtojnar = "Jan Tojnar <jtojnar@gmail.com>";
juliendehos = "Julien Dehos <dehos@lisic.univ-littoral.fr>";
jwiegley = "John Wiegley <johnw@newartisans.com>";
jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";

View File

@ -1,41 +1,42 @@
{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c
, lcms2, libpng , makeWrapper, pkgconfig, python2Packages
, scons, swig
}:
{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg,
pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
let
inherit (python2Packages) python pygtk numpy;
inherit (python2Packages) python pycairo pygobject3 numpy;
in stdenv.mkDerivation rec {
name = "mypaint-${version}";
version = "1.1.0";
version = "1.2.1";
src = fetchurl {
url = "http://download.gna.org/mypaint/${name}.tar.bz2";
sha256 = "0f7848hr65h909c0jkcx616flc0r4qh53g3kd1cgs2nr1pjmf3bq";
src = fetchFromGitHub {
owner = "mypaint";
repo = "mypaint";
rev = "bcf5a28d38bbd586cc9d4cee223f849fa303864f";
sha256 = "1zwx7n629vz1jcrqjqmw6vl6sxdf81fq6a5jzqiga8167gg8s9pf";
fetchSubmodules = true;
};
buildInputs = [
gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk
python scons swig
];
nativeBuildInputs = [ intltool pkgconfig scons swig wrapGAppsHook ];
propagatedBuildInputs = [ hicolor_icon_theme numpy ];
buildInputs = [ gtk3 json_c lcms2 libpng librsvg pycairo pygobject3 python ];
propagatedBuildInputs = [ numpy ];
buildPhase = "scons prefix=$out";
installPhase = ''
scons prefix=$out install
sed -i -e 's|/usr/bin/env python2.7|${python}/bin/python|' $out/bin/mypaint
wrapProgram $out/bin/mypaint \
--prefix PYTHONPATH : $PYTHONPATH \
--prefix XDG_DATA_DIRS ":" "${hicolor_icon_theme}/share"
'';
preFixup = ''
gappsWrapperArgs+=(--prefix PYTHONPATH : $PYTHONPATH)
'';
meta = with stdenv.lib; {
description = "A graphics application for digital painters";
homepage = http://mypaint.intilinux.com;
homepage = http://mypaint.org/;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
maintainers = with maintainers; [ goibhniu jtojnar ];
};
}