From 43580b680048ca2882f28c806262f803341f5c94 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 22 Mar 2018 13:27:31 +0100 Subject: [PATCH] libmypaint: fix build with automake 1.16 --- pkgs/development/libraries/libmypaint/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 0583d94ef7f4..8719f19acc1d 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -1,4 +1,4 @@ -{stdenv, autoconf, automake, fetchFromGitHub, glib, intltool, json_c, libtool, pkgconfig}: +{stdenv, autoconf, automake, fetchFromGitHub, fetchpatch, glib, intltool, json_c, libtool, pkgconfig}: let version = "1.3.0"; @@ -12,6 +12,14 @@ in stdenv.mkDerivation rec { sha256 = "0b7aynr6ggigwhjkfzi8x3dwz15blj4grkg9hysbgjh6lvzpy9jc"; }; + patches = [ + # build with automake 1.16 + (fetchpatch { + url = https://github.com/mypaint/libmypaint/commit/40d9077a80be13942476f164bddfabe842ab2a45.patch; + sha256 = "1dclh7apgvr2bvzy9z3rgas3hk9pf2hpf5h52q94kmx8s4a47qpi"; + }) + ]; + nativeBuildInputs = [ autoconf automake intltool libtool pkgconfig ]; buildInputs = [ glib ];