From 2870e78461f09415a09e3e713e3def35d866cd74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 15 Apr 2024 13:44:14 +0200 Subject: [PATCH] Revert "qt6.qtbase: fixup build by adding #include paths" This reverts commit c5910ff40d9344aca2923d7b47407cfceb695827. It's not needed after the parent commit. --- pkgs/development/libraries/qt-6/modules/qtbase.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase.nix b/pkgs/development/libraries/qt-6/modules/qtbase.nix index 87a4a013e917..a14028e1259a 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase.nix @@ -250,10 +250,7 @@ stdenv.mkDerivation rec { "-framework GSS" ]); - env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\"" - # These flags are in glib-2.0.pc but somehow don't get applied automatically. - + lib.optionalString (!stdenv.hostPlatform.isMinGW) - " -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; + env.NIX_CFLAGS_COMPILE = "-DNIXPKGS_QT_PLUGIN_PREFIX=\"${qtPluginPrefix}\""; outputs = [ "out" "dev" ];