From 09b931bd40fccad6d846750a3244bddf8e027227 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Wed, 21 Jul 2021 21:07:07 +0100 Subject: [PATCH 1/3] octaveFull: fix linker error on Darwin See https://trac.macports.org/ticket/61865. --- pkgs/development/interpreters/octave/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 0a87c1ddcf07..825b035d7a6f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -184,6 +184,9 @@ let enableParallelBuilding = true; + # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; + # See https://savannah.gnu.org/bugs/?50339 F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; From 461466306ef3cef014c8ca4899879a77993b6f7d Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Thu, 22 Jul 2021 21:58:02 +0100 Subject: [PATCH 2/3] 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 825b035d7a6f..e8228d23b0c9 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 ""; From 2b8523fd7e4252455e3596b93a990a7ea6f76ef5 Mon Sep 17 00:00:00 2001 From: Graham Bennett Date: Sat, 24 Jul 2021 16:22:23 +0100 Subject: [PATCH 3/3] portaudio: remove unsupported compiler flag Appears to no longer be supported in the latest clang. --- pkgs/development/libraries/portaudio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 840c9e773f49..4666850c5849 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=implicit-const-int-float-conversion -Wno-error=nullability-completeness-on-arrays"; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays"; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];