pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #226377 from wegank/qt6-qtwebengine-darwin-pre

qt6.qtwebengine: add frameworks for darwin

authored by Weijia Wang and committed by GitHub 488cc85d 3ec47bae

+81 -3
unified split
+10 -1
pkgs/development/libraries/qt-6/default.nix
··· 115 qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { }; 116 qtwayland = callPackage ./modules/qtwayland.nix { }; 117 qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; 118 - qtwebengine = callPackage ./modules/qtwebengine.nix { }; 119 qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; 120 qtwebview = callPackage ./modules/qtwebview.nix { 121 inherit (darwin.apple_sdk_11_0.frameworks) WebKit;
··· 115 qtvirtualkeyboard = callPackage ./modules/qtvirtualkeyboard.nix { }; 116 qtwayland = callPackage ./modules/qtwayland.nix { }; 117 qtwebchannel = callPackage ./modules/qtwebchannel.nix { }; 118 + qtwebengine = callPackage ./modules/qtwebengine.nix { 119 + inherit (darwin) bootstrap_cmds cctools xnu; 120 + inherit (darwin.apple_sdk_11_0) libpm libunwind; 121 + inherit (darwin.apple_sdk_11_0.libs) sandbox; 122 + inherit (darwin.apple_sdk_11_0.frameworks) 123 + AGL AVFoundation Accelerate Cocoa CoreLocation CoreML ForceFeedback 124 + GameController ImageCaptureCore LocalAuthentication 125 + MediaAccessibility MediaPlayer MetalKit Network OpenDirectory Quartz 126 + ReplayKit SecurityInterface Vision; 127 + }; 128 qtwebsockets = callPackage ./modules/qtwebsockets.nix { }; 129 qtwebview = callPackage ./modules/qtwebview.nix { 130 inherit (darwin.apple_sdk_11_0.frameworks) WebKit;
+71 -2
pkgs/development/libraries/qt-6/modules/qtwebengine.nix
··· 51 , systemd 52 , pipewire 53 , gn 54 - , cups 55 - , openbsm 56 , runCommand 57 , writeScriptBin 58 , ffmpeg_4 ··· 67 , mesa 68 , xkeyboard_config 69 , enableProprietaryCodecs ? true 70 }: 71 72 qtModule { ··· 84 which 85 gn 86 nodejs 87 ]; 88 doCheck = true; 89 outputs = [ "out" "dev" ]; ··· 125 126 substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \ 127 --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" 128 ''; 129 130 cmakeFlags = [ ··· 149 "-DQT_FEATURE_webengine_webrtc_pipewire=ON" 150 ] ++ lib.optionals enableProprietaryCodecs [ 151 "-DQT_FEATURE_webengine_proprietary_codecs=ON" 152 ]; 153 154 propagatedBuildInputs = [ ··· 218 219 libkrb5 220 mesa 221 ]; 222 223 buildInputs = [ 224 cups 225 ]; 226 227 requiredSystemFeatures = [ "big-parallel" ];
··· 51 , systemd 52 , pipewire 53 , gn 54 , runCommand 55 , writeScriptBin 56 , ffmpeg_4 ··· 65 , mesa 66 , xkeyboard_config 67 , enableProprietaryCodecs ? true 68 + # darwin 69 + , clang_14 70 + , bootstrap_cmds 71 + , cctools 72 + , xcbuild 73 + , AGL 74 + , AVFoundation 75 + , Accelerate 76 + , Cocoa 77 + , CoreLocation 78 + , CoreML 79 + , ForceFeedback 80 + , GameController 81 + , ImageCaptureCore 82 + , LocalAuthentication 83 + , MediaAccessibility 84 + , MediaPlayer 85 + , MetalKit 86 + , Network 87 + , OpenDirectory 88 + , Quartz 89 + , ReplayKit 90 + , SecurityInterface 91 + , Vision 92 + , openbsm 93 + , libunwind 94 + , cups 95 + , libpm 96 + , sandbox 97 + , xnu 98 }: 99 100 qtModule { ··· 112 which 113 gn 114 nodejs 115 + ] ++ lib.optionals stdenv.isDarwin [ 116 + clang_14 117 + bootstrap_cmds 118 + cctools 119 + xcbuild 120 ]; 121 doCheck = true; 122 outputs = [ "out" "dev" ]; ··· 158 159 substituteInPlace src/3rdparty/chromium/ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.cc \ 160 --replace "/usr/share/X11/xkb" "${xkeyboard_config}/share/X11/xkb" 161 + '' 162 + + lib.optionalString stdenv.isDarwin '' 163 + substituteInPlace configure.cmake \ 164 + --replace "AppleClang" "Clang" 165 + substituteInPlace cmake/Functions.cmake \ 166 + --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" 167 + substituteInPlace src/3rdparty/chromium/third_party/crashpad/crashpad/util/BUILD.gn \ 168 + --replace "\$sysroot/usr" "${xnu}" 169 ''; 170 171 cmakeFlags = [ ··· 190 "-DQT_FEATURE_webengine_webrtc_pipewire=ON" 191 ] ++ lib.optionals enableProprietaryCodecs [ 192 "-DQT_FEATURE_webengine_proprietary_codecs=ON" 193 + ] ++ lib.optionals stdenv.isDarwin [ 194 + "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.targetPlatform.darwinSdkVersion}" 195 ]; 196 197 propagatedBuildInputs = [ ··· 261 262 libkrb5 263 mesa 264 + ] ++ lib.optionals stdenv.isDarwin [ 265 + AGL 266 + AVFoundation 267 + Accelerate 268 + Cocoa 269 + CoreLocation 270 + CoreML 271 + ForceFeedback 272 + GameController 273 + ImageCaptureCore 274 + LocalAuthentication 275 + MediaAccessibility 276 + MediaPlayer 277 + MetalKit 278 + Network 279 + OpenDirectory 280 + Quartz 281 + ReplayKit 282 + SecurityInterface 283 + Vision 284 + 285 + openbsm 286 + libunwind 287 ]; 288 289 buildInputs = [ 290 cups 291 + ] ++ lib.optionals stdenv.isDarwin [ 292 + libpm 293 + sandbox 294 ]; 295 296 requiredSystemFeatures = [ "big-parallel" ];