From 664d9fd9a252569075f21f2b7d13463466d9ae8c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 12 Apr 2023 12:29:07 +0200 Subject: alice-tools-qt6: Fix Qt tool detection on Darwin Meson seems to default to QMake there, which gives search paths into qtbase.out instead of qtbase.dev --- pkgs/tools/games/alice-tools/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/games/alice-tools/default.nix b/pkgs/tools/games/alice-tools/default.nix index d10ce8e65ab6c..07d96cbd03fa0 100644 --- a/pkgs/tools/games/alice-tools/default.nix +++ b/pkgs/tools/games/alice-tools/default.nix @@ -33,8 +33,12 @@ stdenv.mkDerivation (finalAttrs: { }; postPatch = lib.optionalString (withGUI && lib.versionAtLeast qtbase.version "6.0") '' + # Use Meson's Qt6 module substituteInPlace src/meson.build \ --replace qt5 qt6 + + # For some reason Meson uses QMake instead of pkg-config detection method for Qt6 on Darwin, which gives wrong search paths for tools + export PATH=${qtbase.dev}/libexec:$PATH ''; mesonFlags = lib.optionals (withGUI && lib.versionAtLeast qtbase.version "6.0") [ -- cgit 1.4.1