From 44c7781ee802a89dd48615801d18da3df296f19c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 25 Mar 2022 19:50:31 +0100 Subject: [PATCH] lxqt.lxqt-build-tools: Fix finding GLib 2.72 Without this build of packages using this (e.g. lxqt.libqtxdg) will fail. --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 15bc1941af3f..5d5134d38d29 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -22,11 +22,16 @@ mkDerivation rec { sha256 = "1hb04zgpalxv6da3myf1dxsbjix15dczzfq8a24g5dg2zfhwpx21"; }; - # Nix clang on darwin identifies as 'Clang', not 'AppleClang' - # Without this, dependants fail to link. postPatch = '' + # Nix clang on darwin identifies as 'Clang', not 'AppleClang' + # Without this, dependants fail to link. substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \ --replace AppleClang Clang + + # GLib 2.72 moved the file from gio-unix-2.0 to gio-2.0. + # https://github.com/lxqt/lxqt-build-tools/pull/74 + substituteInPlace cmake/find-modules/FindGLIB.cmake \ + --replace gio/gunixconnection.h gio/gunixfdlist.h ''; nativeBuildInputs = [