about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOPNA2608 <christoph.neidahl@gmail.com>2023-04-12 12:29:07 +0200
committerOPNA2608 <christoph.neidahl@gmail.com>2023-04-12 12:29:07 +0200
commit664d9fd9a252569075f21f2b7d13463466d9ae8c (patch)
tree2f560d71997d226a4cc30faeb3ae3a66f495fac3
parent82c8852b6f60e838d50dcd1b1add6d6aa61e8a6e (diff)
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
-rw-r--r--pkgs/tools/games/alice-tools/default.nix4
1 files changed, 4 insertions, 0 deletions
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") [