Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a98302aa9b96
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e90b05bfd83a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 7, 2021

  1. mtPaint: 3.49.12 → 3.50.01

    @sikmir
    sikmir committed Jan 7, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    primeos Michael Weiss
    GPG key ID: 5BE487C4D4771D83
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0231df9 View commit details

Commits on Jan 8, 2021

  1. Merge pull request #108729 from sikmir/mtpaint 

    mtPaint: 3.49.12 → 3.50.01
    @SuperSandro2000
    SuperSandro2000 authored Jan 8, 2021
    Copy the full SHA
    e90b05b View commit details
Showing with 11 additions and 9 deletions.
  1. +11 −9 pkgs/applications/graphics/mtpaint/default.nix
20 changes: 11 additions & 9 deletions pkgs/applications/graphics/mtpaint/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
{ stdenv, fetchFromGitHub
, pkgconfig
, freetype, giflib, gtk2, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle
, pkg-config
, freetype, giflib, gtk3, lcms2, libjpeg, libpng, libtiff, openjpeg, gifsicle
}:

stdenv.mkDerivation rec {
p_name = "mtPaint";
ver_maj = "3.49";
ver_min = "12";
ver_maj = "3.50";
ver_min = "01";
name = "${p_name}-${ver_maj}.${ver_min}";

src = fetchFromGitHub {
owner = "wjaguar";
repo = p_name;
rev = "6aed1b0441f99055fc7d475942f8bd5cb23c41f8";
sha256 = "0bvf623g0n2ifijcxv1nw0z3wbs2vhhdky4n04ywsbjlykm44nd1";
rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f";
sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y";
};

nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
freetype giflib gtk2 lcms2 libjpeg libpng libtiff openjpeg gifsicle
freetype giflib gtk3 lcms2 libjpeg libpng libtiff openjpeg gifsicle
];

configureFlags = [ "gtk3" "intl" "man" ];

meta = {
description = "A simple GTK painting program";
longDescription = ''
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
GNU/Linux, Windows and older PC hardware.
'';
homepage = "http://mtpaint.sourceforge.net/";
license = stdenv.lib.licenses.gpl3;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.vklquevs ];
};