tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #145473 from talyz/qt512-big-sur-fix

qt512: Make apps work on macOS Big Sur

authored by

Kim Lindberger and committed by
GitHub 855a211f cfaff973

+11 -10
unified split
-5
pkgs/applications/video/mkvtoolnix/default.nix
··· 122 122 123 123 dontWrapQtApps = true; 124 124 125 - # Avoid Qt 5.12 problem on Big Sur: https://bugreports.qt.io/browse/QTBUG-87014 126 - qtWrapperArgs = lib.optionals stdenv.isDarwin [ 127 - "--set QT_MAC_WANTS_LAYER 1" 128 - ]; 129 - 130 125 postFixup = optionalString withGUI '' 131 126 wrapQtApp $out/bin/mkvtoolnix-gui 132 127 '';
-5
pkgs/development/interpreters/octave/default.nix
··· 187 187 # Fix linker error on Darwin (see https://trac.macports.org/ticket/61865) 188 188 NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lobjc"; 189 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 - 195 190 # See https://savannah.gnu.org/bugs/?50339 196 191 F77_INTEGER_8_FLAG = if use64BitIdx then "-fdefault-integer-8" else ""; 197 192
+11
pkgs/development/libraries/qt-5/5.12/default.nix
··· 70 70 # Ensure -I${includedir} is added to Cflags in pkg-config files. 71 71 # See https://github.com/NixOS/nixpkgs/issues/52457 72 72 ./qtbase.patch.d/0014-qtbase-pkg-config.patch 73 + 74 + # Make Qt applications work on macOS Big Sur even if they're 75 + # built with an older version of the macOS SDK (<10.14). This 76 + # issue is fixed in 5.12.11, but it requires macOS SDK 10.13 to 77 + # build. See https://bugreports.qt.io/browse/QTBUG-87014 for 78 + # more info. 79 + (fetchpatch { 80 + name = "big_sur_layer_backed_views.patch"; 81 + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=c5d904639dbd690a36306e2b455610029704d821"; 82 + sha256 = "0crkw3j1iwdc1pbf5dhar0b4q3h5gs2q1sika8m12y02yk3ns697"; 83 + }) 73 84 ]; 74 85 qtdeclarative = [ ./qtdeclarative.patch ]; 75 86 qtlocation = [ ./qtlocation-gcc-9.patch ];