From d3dab0e67dcceacc7b09d1c65f7442c6ee7ba656 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 30 Mar 2022 16:39:33 +0800 Subject: [PATCH] gnome.devhelp: fix build with meson 0.61 --- pkgs/desktops/gnome/devtools/devhelp/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix index 2ad3c3ff39ad..4a024f6ff413 100644 --- a/pkgs/desktops/gnome/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +31,15 @@ stdenv.mkDerivation rec { sha256 = "7KqQsPTaqPsgMPbcaQv1M/+Zp3NDf+Dhis/oLZl/YNI="; }; + patches = [ + # Fix build with meson 0.61 + # https://gitlab.gnome.org/GNOME/devhelp/-/issues/59 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/devhelp/-/commit/281bade14c1925cf9e7329fa8e9cf2d82512c66f.patch"; + sha256 = "LmHoeQ0zJwOhuasAUYy8FfpDnEO+UNfEb293uKttYKo="; + }) + ]; + nativeBuildInputs = [ meson ninja