From 6d2201aecfd7e66ce3ba0a144f8c9e55f6991718 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 25 Mar 2019 23:21:01 +0100 Subject: [PATCH] mate.libmatekbd: fix build --- pkgs/desktops/mate/libmatekbd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 15b81a62886..395d69c28e6 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, libxklavier }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk3, mate, libxklavier }: stdenv.mkDerivation rec { name = "libmatekbd-${version}"; @@ -9,6 +9,14 @@ stdenv.mkDerivation rec { sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1"; }; + patches = [ + # Fix build with glib 2.60 (TODO: remove after 1.22.0 update) + (fetchpatch { + url = https://github.com/mate-desktop/libmatekbd/commit/dc04e969dd61a2b1f82beae2d3c8ad105447812d.patch; + sha256 = "1ps6mbj6hrm9djn4riya049w2cb0dknghysny8pafmvpkaqvckrb"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ gtk3 libxklavier ];