diff options
| author | OPNA2608 <christoph.neidahl@gmail.com> | 2023-04-12 12:29:07 +0200 |
|---|---|---|
| committer | OPNA2608 <christoph.neidahl@gmail.com> | 2023-04-12 12:29:07 +0200 |
| commit | 664d9fd9a252569075f21f2b7d13463466d9ae8c (patch) | |
| tree | 2f560d71997d226a4cc30faeb3ae3a66f495fac3 /pkgs/tools/games | |
| parent | 82c8852b6f60e838d50dcd1b1add6d6aa61e8a6e (diff) | |
| download | nixpkgs-664d9fd9a252569075f21f2b7d13463466d9ae8c.tar nixpkgs-664d9fd9a252569075f21f2b7d13463466d9ae8c.tar.gz nixpkgs-664d9fd9a252569075f21f2b7d13463466d9ae8c.tar.bz2 nixpkgs-664d9fd9a252569075f21f2b7d13463466d9ae8c.tar.lz nixpkgs-664d9fd9a252569075f21f2b7d13463466d9ae8c.tar.xz nixpkgs-664d9fd9a252569075f21f2b7d13463466d9ae8c.tar.zst nixpkgs-664d9fd9a252569075f21f2b7d13463466d9ae8c.zip | |
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
Diffstat (limited to 'pkgs/tools/games')
| -rw-r--r-- | pkgs/tools/games/alice-tools/default.nix | 4 |
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 d10ce8e65ab..07d96cbd03f 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") [ |