pyrox.dev
lol
Merge pull request #131379 from graham33/fix/octave_darwin_fixes
pkgs:octaveFull: darwin fixes
authored by
Michael Raskin
and committed by
GitHub
4be510e3
fa7ecff4
+9
-1
+8
pkgs/development/interpreters/octave/default.nix
+8
pkgs/development/interpreters/octave/default.nix
···
184
184
185
185
enableParallelBuilding = true;
186
186
187
+
# Fix linker error on Darwin (see https://trac.macports.org/ticket/61865)
188
+
NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc";
189
+
190
+
# Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014
191
+
qtWrapperArgs = lib.optionals stdenv.isDarwin [
192
+
"--set QT_MAC_WANTS_LAYER 1"
193
+
];
194
+
187
195
# See https://savannah.gnu.org/bugs/?50339
188
196
F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else "";
189
197
+1
-1
pkgs/development/libraries/portaudio/default.nix
+1
-1
pkgs/development/libraries/portaudio/default.nix
···
23
23
24
24
configureFlags = [ "--disable-mac-universal" "--enable-cxx" ];
25
25
26
-
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";
26
+
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays";
27
27
28
28
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ];
29
29