apply build system patches

This is a more upstreamable approach, and doesn't require any kind of
weird substitution on our end. It also avoids downloading Kotlin in our
antDeps and fixes cross compilation!! (only tested on aarch64)

Signed-off-by: Seth Flynn <[email protected]>

9 files changed, 322 insertions, 84 deletions

diff --git a/lwjgl.nix b/lwjgl.nix
index f860abb..1d633d7 100644
--- a/lwjgl.nix
+++ b/lwjgl.nix
@@ -13,12 +13,12 @@
     versions = {
       "3.3.4" = {
         hash = "sha256-U0pPeTqVoruqqhhMrBrczy0qt83a8atr8DyRcGgX/yI=";
-        antHash = "sha256-7jVlKBia8dJGuBjNwaljHBrXUep9KjOHHyZESayFnhs=";
+        antHash = "sha256-BE2sSPgYELCkww8aJV5DYTgHy4LT14RTVh6gRXA64+Q=";
       };
 
       "3.3.6" = {
         hash = "sha256-iXwsTo394uoq8/jIlfNuQlXW1lnuge+5/+00O4UdvyA=";
-        antHash = "sha256-XNJpu6nS7gloQuKJadaUHeW0N9EpFKmJEib6/I2exVE=";
+        antHash = "sha256-n2ON2eMBWZbu4A2yPBR4wN17dpWkBrf+1nq2l4uK3yk=";
       };
     };
   };
diff --git a/pkgs/fetch-ant-deps.nix b/pkgs/fetch-ant-deps.nix
index 69e29b4..a63f76e 100644
--- a/pkgs/fetch-ant-deps.nix
+++ b/pkgs/fetch-ant-deps.nix
@@ -32,7 +32,8 @@ lib.makeOverridable (
 
         buildPhase = ''
           runHook preBuild
-          ant init
+          concatTo flagsArray buildFlags buildFlagsArray antFlags antFlagsArray
+          ant init "''${flagsArray[@]}"
           runHook postBuild
         '';
 
diff --git a/pkgs/lwjgl/0001-build-use-pkg-config-for-linux-dependencies.patch b/pkgs/lwjgl/0001-build-use-pkg-config-for-linux-dependencies.patch
new file mode 100644
index 0000000..38c3878
--- /dev/null
+++ b/pkgs/lwjgl/0001-build-use-pkg-config-for-linux-dependencies.patch
@@ -0,0 +1,81 @@
+From cee6a98721d8417802fcd394df0215312be9a7ea Mon Sep 17 00:00:00 2001
+From: Seth Flynn <[email protected]>
+Date: Wed, 5 Mar 2025 16:20:59 -0500
+Subject: [PATCH 1/5] build: use pkg-config for linux dependencies
+
+Adapted from https://cgit.freebsd.org/ports/commit/?id=680dc7bb031d0f708c2dd38f055ec8d63ee68b8a
+---
+ config/linux/build.xml | 37 ++++++++++++++++++++++---------------
+ 1 file changed, 22 insertions(+), 15 deletions(-)
+
+diff --git a/config/linux/build.xml b/config/linux/build.xml
+index a1798b6aa..11e4743ab 100644
+--- a/config/linux/build.xml
++++ b/config/linux/build.xml
+@@ -281,16 +281,17 @@
+         <!-- NativeFileDialog -->
+         <build module="nfd" simple="true" linker="g++" if:true="${binding.nfd}">
+             <beforeCompile>
++                <local name="gtk3-cflags"/>
++                <local name="gtk3-libflags"/>
++                <local name="stderr"/>
++                <exec outputproperty="gtk3-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="gtk-3.0-cflags">
++                    <arg line="--cflags gtk+-3.0"/>
++                </exec>
++                <exec outputproperty="gtk3-libflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="gtk-3.0-libflags">
++                    <arg line="--libs gtk+-3.0"/>
++                </exec>
+                 <compile lang="c++">
+-                    <arg value="-I/usr/include/gtk-3.0"/>
+-                    <arg value="-I/usr/include/glib-2.0"/>
+-                    <arg value="-I/usr/include/pango-1.0"/>
+-                    <arg value="-I/usr/include/harfbuzz"/>
+-                    <arg value="-I/usr/include/cairo"/>
+-                    <arg value="-I/usr/include/gdk-pixbuf-2.0"/>
+-                    <arg value="-I/usr/include/atk-1.0"/>
+-                    <arg value="-I/usr/lib64/glib-2.0/include"/>
+-                    <arg value="-I/usr/lib/${linux.triplet}/glib-2.0/include"/>
++                    <arg line="${gtk3-cflags}"/>
+                     <arg value="-I${src.main.rel}/include"/>
+                     <fileset dir="." includes="${src.main}/nfd_gtk.cpp"/>
+                 </compile>
+@@ -299,16 +300,22 @@
+                 <arg value="-I${src.main.rel}/include"/>
+             </source>
+             <link>
+-                <arg value="-lglib-2.0"/>
+-                <arg value="-lgobject-2.0"/>
+-                <arg value="-lgtk-3"/>
+-                <arg value="-lgdk-3"/>
++                <arg line="${gtk3-libflags}"/>
+             </link>
+         </build>
+         <build module="nfd" suffix="_portal" simple="true" linker="g++" if:true="${binding.nfd}">
+             <beforeCompile>
++                <local name="glib-cflags"/>
++                <local name="glib-libflags"/>
++                <local name="stderr"/>
++                <exec outputproperty="glib-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="glib-cflags">
++                    <arg line="--cflags glib-2.0"/>
++                </exec>
++                <exec outputproperty="glib-libflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="glib-libflags">
++                    <arg line="--libs glib-2.0"/>
++                </exec>
+                 <compile lang="c++">
+-                    <arg line="-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/${linux.triplet}/dbus-1.0/include"/>
++                    <arg line="${glib-cflags}"/>
+                     <arg value="-I${src.main.rel}/include"/>
+                     <fileset dir="." includes="${src.main}/nfd_portal.cpp"/>
+                 </compile>
+@@ -317,7 +324,7 @@
+                 <arg value="-I${src.main.rel}/include"/>
+             </source>
+             <link>
+-                <arg value="-ldbus-1"/>
++                <arg line="${glib-libflags}"/>
+             </link>
+         </build>
+ 
+-- 
+2.48.1
+
diff --git a/pkgs/lwjgl/0002-build-allow-local-kotlin.patch b/pkgs/lwjgl/0002-build-allow-local-kotlin.patch
new file mode 100644
index 0000000..7b7a4a2
--- /dev/null
+++ b/pkgs/lwjgl/0002-build-allow-local-kotlin.patch
@@ -0,0 +1,50 @@
+From 05573f96ed4b73591679bdf2c17a83f57acfd171 Mon Sep 17 00:00:00 2001
+From: Seth Flynn <[email protected]>
+Date: Wed, 5 Mar 2025 16:34:50 -0500
+Subject: [PATCH 2/5] build: allow local kotlin
+
+Adapted from https://cgit.freebsd.org/ports/commit/?id=680dc7bb031d0f708c2dd38f055ec8d63ee68b8a
+---
+ config/build-definitions.xml | 3 ++-
+ update-dependencies.xml      | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/config/build-definitions.xml b/config/build-definitions.xml
+index 407195ff7..4026a057c 100644
+--- a/config/build-definitions.xml
++++ b/config/build-definitions.xml
+@@ -121,7 +121,8 @@ This script is included in /build.xml and /config/update-dependencies.xml.
+ 
+     <property name="lib" location="bin/libs" relative="true"/>
+ 
+-    <property name="kotlinc" location="${lib}/kotlinc" relative="true"/>
++    <property name="kotlinc" location="${lib}/kotlinc" relative="true" unless:set="local.kotlin" />
++    <property name="kotlinc" location="${local.kotlin}" relative="false" if:set="local.kotlin"/>
+ 
+     <property name="module.lwjgl" location="modules/lwjgl" relative="true"/>
+ 
+diff --git a/update-dependencies.xml b/update-dependencies.xml
+index 98fd77b19..39501492a 100644
+--- a/update-dependencies.xml
++++ b/update-dependencies.xml
+@@ -27,7 +27,7 @@
+     <target name="check-dependencies" description="Updates LWJGL dependencies, if required" unless="${build.offline}">
+         <!-- Checks if the Kotlin compiler must be updated -->
+         <local name="kotlinc-build-current"/>
+-        <loadfile property="kotlinc-build-current" srcfile="${kotlinc}/build.txt" quiet="true" taskname="kotlinc"/>
++        <loadfile property="kotlinc-build-current" srcfile="${kotlinc}/build.txt" quiet="true" taskname="kotlinc" unless:set="local.kotlin" />
+         <condition property="kotlinc-uptodate">
+             <and>
+                 <isset property="kotlinc-build-current"/>
+@@ -54,7 +54,7 @@
+         <mkdir dir="${lib}"/>
+         <mkdir dir="${lib}/java"/>
+         <antcall target="-lib-download"/>
+-        <antcall target="-kotlinc-download"/>
++        <antcall target="-kotlinc-download" unless:set="local.kotlin" />
+     </target>
+ 
+     <!-- Downloads and extracts the Kotlin compiler. -->
+-- 
+2.48.1
+
diff --git a/pkgs/lwjgl/0003-build-allow-linking-against-system-libffi.patch b/pkgs/lwjgl/0003-build-allow-linking-against-system-libffi.patch
new file mode 100644
index 0000000..e212bfa
--- /dev/null
+++ b/pkgs/lwjgl/0003-build-allow-linking-against-system-libffi.patch
@@ -0,0 +1,38 @@
+From f79338f70f72e5d4606b8d99c2f49f85b486be3e Mon Sep 17 00:00:00 2001
+From: Seth Flynn <[email protected]>
+Date: Wed, 5 Mar 2025 16:43:57 -0500
+Subject: [PATCH 3/5] build: allow linking against system libffi
+
+Adapted from https://cgit.freebsd.org/ports/commit/?id=680dc7bb031d0f708c2dd38f055ec8d63ee68b8a
+---
+ config/linux/build.xml | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/config/linux/build.xml b/config/linux/build.xml
+index 11e4743ab..4500d23c0 100644
+--- a/config/linux/build.xml
++++ b/config/linux/build.xml
+@@ -194,16 +194,18 @@
+                     <include name="${module.lwjgl}/jawt/src/generated/c/*.c" if:true="${binding.jawt}"/>
+                 </fileset>
+             </source>
+-            <beforeLink>
++            <beforeLink unless:true="${use.libffi.so}">
+                 <parallel threadsPerProcessor="2" failonany="true" unless:set="lib-dependencies-uptodate">
+                     <update-dependency module="core" artifact="core/libffi.a"/>
+                 </parallel>
+             </beforeLink>
+             <link>
+-                <fileset dir="${lib.native}/org/lwjgl">
++                <fileset dir="${lib.native}/org/lwjgl" unless:true="${use.libffi.so}">
+                     <include name="libffi.a"/>
+                 </fileset>
+                 <arg value="-ldl"/>
++                <arg value="-lffi" if:true="${use.libffi.so}"/>
++                <arg value="-L${libffi.path}" if:set="libffi.path"/>
+             </link>
+         </build>
+ 
+-- 
+2.48.1
+
diff --git a/pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch b/pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch
new file mode 100644
index 0000000..0f6eb87
--- /dev/null
+++ b/pkgs/lwjgl/0004-build-add-dbus-as-dependency-for-nfd_portal.patch
@@ -0,0 +1,50 @@
+From 3aa1fc52ef6a72c99f1224e4c8ba2aedeb515277 Mon Sep 17 00:00:00 2001
+From: Seth Flynn <[email protected]>
+Date: Wed, 5 Mar 2025 17:10:20 -0500
+Subject: [PATCH 4/5] build: add dbus as dependency for nfd_portal
+
+---
+ config/linux/build.xml | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/config/linux/build.xml b/config/linux/build.xml
+index 4500d23c0..829ce2b1d 100644
+--- a/config/linux/build.xml
++++ b/config/linux/build.xml
+@@ -307,9 +307,17 @@
+         </build>
+         <build module="nfd" suffix="_portal" simple="true" linker="g++" if:true="${binding.nfd}">
+             <beforeCompile>
++                <local name="dbus-cflags"/>
++                <local name="dbus-libflags"/>
+                 <local name="glib-cflags"/>
+                 <local name="glib-libflags"/>
+                 <local name="stderr"/>
++                <exec outputproperty="dbus-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="dbus-cflags">
++                    <arg line="--cflags dbus-1"/>
++                </exec>
++                <exec outputproperty="dbus-libflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="dbus-libflags">
++                    <arg line="--libs dbus-1"/>
++                </exec>
+                 <exec outputproperty="glib-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="glib-cflags">
+                     <arg line="--cflags glib-2.0"/>
+                 </exec>
+@@ -317,6 +325,7 @@
+                     <arg line="--libs glib-2.0"/>
+                 </exec>
+                 <compile lang="c++">
++                    <arg line="${dbus-cflags}"/>
+                     <arg line="${glib-cflags}"/>
+                     <arg value="-I${src.main.rel}/include"/>
+                     <fileset dir="." includes="${src.main}/nfd_portal.cpp"/>
+@@ -326,6 +335,7 @@
+                 <arg value="-I${src.main.rel}/include"/>
+             </source>
+             <link>
++                <arg line="${dbus-libflags}"/>
+                 <arg line="${glib-libflags}"/>
+             </link>
+         </build>
+-- 
+2.48.1
+
diff --git a/pkgs/lwjgl/0005-build-allow-setting-pkg-config-prefix-suffix.patch b/pkgs/lwjgl/0005-build-allow-setting-pkg-config-prefix-suffix.patch
new file mode 100644
index 0000000..ff39bec
--- /dev/null
+++ b/pkgs/lwjgl/0005-build-allow-setting-pkg-config-prefix-suffix.patch
@@ -0,0 +1,64 @@
+From 57db58f899e99bc37cbc98b6403ab9aa2f04862f Mon Sep 17 00:00:00 2001
+From: Seth Flynn <[email protected]>
+Date: Thu, 6 Mar 2025 02:31:35 -0500
+Subject: [PATCH 5/5] build: allow setting pkg-config prefix & suffix
+
+---
+ config/linux/build.xml | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/config/linux/build.xml b/config/linux/build.xml
+index 829ce2b1d..0c0700fb9 100644
+--- a/config/linux/build.xml
++++ b/config/linux/build.xml
+@@ -18,6 +18,13 @@
+         <isset property="gcc.version"/>
+     </condition>
+ 
++    <condition property="pkg-config.prefix" value="" else="${linux.triplet}-">
++        <isset property="build.arch.x64|x86"/>
++    </condition>
++    <condition property="pkg-config.suffix" value="-${pkg-config.version}" else="">
++        <isset property="pkg-config.version"/>
++    </condition>
++
+     <property name="module.lwjgl.rel" value="../../../../${module.lwjgl}"/>
+ 
+     <macrodef name="compile">
+@@ -286,10 +293,10 @@
+                 <local name="gtk3-cflags"/>
+                 <local name="gtk3-libflags"/>
+                 <local name="stderr"/>
+-                <exec outputproperty="gtk3-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="gtk-3.0-cflags">
++								<exec outputproperty="gtk3-cflags" errorproperty="stderr" executable="${pkg-config.prefix}pkg-config${pkg-config.suffix}" failonerror="true" taskname="gtk-3.0-cflags">
+                     <arg line="--cflags gtk+-3.0"/>
+                 </exec>
+-                <exec outputproperty="gtk3-libflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="gtk-3.0-libflags">
++                <exec outputproperty="gtk3-libflags" errorproperty="stderr" executable="${pkg-config.prefix}pkg-config${pkg-config.suffix}" failonerror="true" taskname="gtk-3.0-libflags">
+                     <arg line="--libs gtk+-3.0"/>
+                 </exec>
+                 <compile lang="c++">
+@@ -312,16 +319,16 @@
+                 <local name="glib-cflags"/>
+                 <local name="glib-libflags"/>
+                 <local name="stderr"/>
+-                <exec outputproperty="dbus-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="dbus-cflags">
++                <exec outputproperty="dbus-cflags" errorproperty="stderr" executable="${pkg-config.prefix}pkg-config${pkg-config.suffix}" failonerror="true" taskname="dbus-cflags">
+                     <arg line="--cflags dbus-1"/>
+                 </exec>
+-                <exec outputproperty="dbus-libflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="dbus-libflags">
++                <exec outputproperty="dbus-libflags" errorproperty="stderr" executable="${pkg-config.prefix}pkg-config${pkg-config.suffix}" failonerror="true" taskname="dbus-libflags">
+                     <arg line="--libs dbus-1"/>
+                 </exec>
+-                <exec outputproperty="glib-cflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="glib-cflags">
++                <exec outputproperty="glib-cflags" errorproperty="stderr" executable="${pkg-config.prefix}pkg-config${pkg-config.suffix}" failonerror="true" taskname="glib-cflags">
+                     <arg line="--cflags glib-2.0"/>
+                 </exec>
+-                <exec outputproperty="glib-libflags" errorproperty="stderr" executable="pkg-config" failonerror="true" taskname="glib-libflags">
++                <exec outputproperty="glib-libflags" errorproperty="stderr" executable="${pkg-config.prefix}pkg-config${pkg-config.suffix}" failonerror="true" taskname="glib-libflags">
+                     <arg line="--libs glib-2.0"/>
+                 </exec>
+                 <compile lang="c++">
+-- 
+2.48.1
+
diff --git a/pkgs/lwjgl/default.nix b/pkgs/lwjgl/default.nix
index 546c45c..bebd70a 100644
--- a/pkgs/lwjgl/default.nix
+++ b/pkgs/lwjgl/default.nix
@@ -3,22 +3,17 @@
   stdenv,
   breakpointHook,
   ant,
-  at-spi2-atk,
   buildPackages,
-  cairo,
   dbus,
   fetchAntDeps,
   fetchFromGitHub,
-  gdk-pixbuf,
   glib,
   gtk3,
-  harfbuzz,
   kotlin,
   libGLU,
   libffi,
   libglvnd,
-  pango,
-  replaceVars,
+  pkg-config,
   xorg,
 
   version,
@@ -38,20 +33,11 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    (replaceVars ./fix-library-paths.patch (
-      lib.mapAttrs (lib.const lib.getDev) {
-        inherit
-          at-spi2-atk
-          cairo
-          dbus
-          gdk-pixbuf
-          glib
-          gtk3
-          harfbuzz
-          pango
-          ;
-      }
-    ))
+    ./0001-build-use-pkg-config-for-linux-dependencies.patch
+    ./0002-build-allow-local-kotlin.patch
+    ./0003-build-allow-linking-against-system-libffi.patch
+    ./0004-build-add-dbus-as-dependency-for-nfd_portal.patch
+    ./0005-build-allow-setting-pkg-config-prefix-suffix.patch
   ];
 
   antJdk = buildPackages.jdk_headless;
@@ -60,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
       pname
       version
       src
+      patches
       antJdk
+      antFlags
       ;
     hash = antHash;
   };
@@ -70,32 +58,40 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     ant
     kotlin
+    pkg-config
   ] ++ lib.optional (lib.meta.availableOn stdenv.buildPlatform breakpointHook) breakpointHook;
 
   buildInputs = [
-    at-spi2-atk
-    cairo
     dbus
-    gdk-pixbuf
     glib
     gtk3
-    harfbuzz
     libGLU
     libffi
-    pango
     xorg.libX11
     xorg.libXt
   ];
 
+  antFlags =
+    [
+      "-Dgcc.libpath.opengl=${libglvnd}/lib"
+
+      "-Dlibffi.path=${lib.getLib libffi}/lib"
+      "-Duse.libffi.so=true"
+
+      "-Dlocal.kotlin=${lib.getBin kotlin}"
+    ]
+    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+      "-Dgcc.prefix=${stdenv.cc.targetPrefix}"
+      "-Dpkg-config.prefix=${stdenv.cc.targetPrefix}"
+    ];
+
   env = {
-    NIX_CFLAGS = "-funroll-loops -I${lib.getDev gtk3}/include/gtk-3.0";
     NIX_LDFLAGS = "-lffi";
 
     JAVA_HOME = finalAttrs.antJdk.home;
     JAVA8_HOME = buildPackages.jdk8_headless.home;
 
     # https://github.com/LWJGL/lwjgl3/tree/e8552d53624f789c8f8c3dc35976fa02cba73cff/doc#build-configuration
-    LWJGL_BUILD_OFFLINE = "yes";
     LWJGL_BUILD_ARCH =
       if stdenv.hostPlatform.isx86_64 then
         "x64"
@@ -109,6 +105,8 @@ stdenv.mkDerivation (finalAttrs: {
         "riscv64"
       else
         throw "${stdenv.hostPlatform.cpu.name} is not a supported architecture";
+    LWJGL_BUILD_OFFLINE = "yes";
+    LWJGL_BUILD_TYPE = "release/${finalAttrs.version}";
   };
 
   # Put the dependencies we already downloaded in the right place
@@ -120,29 +118,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   postBuild = ''
     mkdir $out
-    ant \
-      -emacs \
-      -Dgcc.libpath.opengl=${libglvnd}/lib \
-    	compile-templates compile-native
+    concatTo flagsArray buildFlags buildFlagsArray antFlags antFlagsArray
+    ant compile-templates compile compile-native "''${flagsArray[@]}"
   '';
 
   postInstall = ''
-    exit 1
+    mkdir -p $out/lib
+    find . -type f -name '*.so' -exec install -Dm755 -t $out/lib {} \;
   '';
 
   meta = {
-    platforms =
-
-      let
-        architectures = lib.flatten [
-          lib.platforms.x86_64
-          lib.platforms.i686
-          lib.platforms.aarch64
-          lib.platforms.armv7
-          lib.platforms.riscv64
-        ];
-      in
-
-      lib.intersectLists architectures lib.platforms.linux;
+    description = "Lightweight Java Game Library";
+    homepage = "https://www.lwjgl.org/";
+    changelog = "https://github.com/LWJGL/lwjgl3/releases/tag/${toString finalAttrs.src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/lwjgl/fix-library-paths.patch b/pkgs/lwjgl/fix-library-paths.patch
deleted file mode 100644
index 0d6b332..0000000
--- a/pkgs/lwjgl/fix-library-paths.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/config/linux/build.xml b/config/linux/build.xml
-index a1798b6aa..13a75815f 100644
---- a/config/linux/build.xml
-+++ b/config/linux/build.xml
-@@ -282,15 +282,13 @@
-         <build module="nfd" simple="true" linker="g++" if:true="${binding.nfd}">
-             <beforeCompile>
-                 <compile lang="c++">
--                    <arg value="-I/usr/include/gtk-3.0"/>
--                    <arg value="-I/usr/include/glib-2.0"/>
--                    <arg value="-I/usr/include/pango-1.0"/>
--                    <arg value="-I/usr/include/harfbuzz"/>
--                    <arg value="-I/usr/include/cairo"/>
--                    <arg value="-I/usr/include/gdk-pixbuf-2.0"/>
--                    <arg value="-I/usr/include/atk-1.0"/>
--                    <arg value="-I/usr/lib64/glib-2.0/include"/>
--                    <arg value="-I/usr/lib/${linux.triplet}/glib-2.0/include"/>
-+                    <arg value="-I@gtk3@"/>
-+                    <arg value="-I@glib@"/>
-+                    <arg value="-I@pango@"/>
-+                    <arg value="-I@harfbuzz@"/>
-+                    <arg value="-I@cairo@"/>
-+                    <arg value="-I@gdk-pixbuf@"/>
-+                    <arg value="-I@at-spi2-atk@"/>
-                     <arg value="-I${src.main.rel}/include"/>
-                     <fileset dir="." includes="${src.main}/nfd_gtk.cpp"/>
-                 </compile>
-@@ -308,7 +306,7 @@
-         <build module="nfd" suffix="_portal" simple="true" linker="g++" if:true="${binding.nfd}">
-             <beforeCompile>
-                 <compile lang="c++">
--                    <arg line="-I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/${linux.triplet}/dbus-1.0/include"/>
-+                    <arg line="-I@dbus@"/>
-                     <arg value="-I${src.main.rel}/include"/>
-                     <fileset dir="." includes="${src.main}/nfd_portal.cpp"/>
-                 </compile>