diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2021-07-25 07:54:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 07:54:03 +0000 |
| commit | 4be510e3adfbe630e32e8d92feebaa603270e68f (patch) | |
| tree | aa33525483c001d2bc3a81c24a09cc5a9f92cf8b /pkgs/development/interpreters | |
| parent | fa7ecff45f8c316c0a0da6ead3abeeaf92cbadbd (diff) | |
| parent | 2b8523fd7e4252455e3596b93a990a7ea6f76ef5 (diff) | |
| download | nixlib-4be510e3adfbe630e32e8d92feebaa603270e68f.tar nixlib-4be510e3adfbe630e32e8d92feebaa603270e68f.tar.gz nixlib-4be510e3adfbe630e32e8d92feebaa603270e68f.tar.bz2 nixlib-4be510e3adfbe630e32e8d92feebaa603270e68f.tar.lz nixlib-4be510e3adfbe630e32e8d92feebaa603270e68f.tar.xz nixlib-4be510e3adfbe630e32e8d92feebaa603270e68f.tar.zst nixlib-4be510e3adfbe630e32e8d92feebaa603270e68f.zip | |
Merge pull request #131379 from graham33/fix/octave_darwin_fixes
pkgs:octaveFull: darwin fixes
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 0a87c1ddcf07..e8228d23b0c9 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -184,6 +184,14 @@ let enableParallelBuilding = true; + # 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 ""; |