From 461466306ef3cef014c8ca4899879a77993b6f7d Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Thu, 22 Jul 2021 21:58:02 +0100 Subject: [PATCH] octaveFull: set QT_MAC_WANTS_LAYER=1 on Darwin This avoids a Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 --- pkgs/development/interpreters/octave/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 825b035d7a6..e8228d23b0c 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -187,6 +187,11 @@ let # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; + # Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 + qtWrapperArgs = lib.optionals stdenv.isDarwin [ + "--set QT_MAC_WANTS_LAYER 1" + ]; + # See https://savannah.gnu.org/bugs/?50339 F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";