ladybird: Update darwin sdk version (#361319)

This commit is contained in:
Francesco Gazzetta
2024-12-26 23:11:13 +00:00
committed by GitHub
3 changed files with 12 additions and 15 deletions
@@ -19,14 +19,12 @@
, qt6Packages
, woff2
, ffmpeg
, fontconfig
, simdutf
, skia
, nixosTests
, AppKit
, Cocoa
, Foundation
, OpenGL
, unstableGitUpdater
, apple-sdk_14
}:
let
@@ -107,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = with qt6Packages; [
curl
ffmpeg
fontconfig
libavif
libjxl
libwebp
@@ -120,10 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
libpulseaudio.dev
qtwayland
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
AppKit
Cocoa
Foundation
OpenGL
apple-sdk_14
];
cmakeFlags = [
@@ -158,7 +154,5 @@ stdenv.mkDerivation (finalAttrs: {
maintainers = with maintainers; [ fgaz ];
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
mainProgram = "Ladybird";
# use of undeclared identifier 'NSBezelStyleAccessoryBarAction'
broken = stdenv.hostPlatform.isDarwin;
};
})
+7 -1
View File
@@ -20,6 +20,7 @@
, cctools
, zlib
, apple-sdk_11
, fixDarwinDylibNames
, enableVulkan ? !stdenv.hostPlatform.isDarwin
}:
@@ -49,7 +50,12 @@ stdenv.mkDerivation (finalAttrs: {
gn
ninja
python3
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild cctools.libtool zlib ];
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
xcbuild
cctools.libtool
zlib
fixDarwinDylibNames
];
buildInputs = [
expat
+1 -4
View File
@@ -14395,10 +14395,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = callPackage ../applications/networking/browsers/ladybird {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL;
};
ladybird = callPackage ../applications/networking/browsers/ladybird { };
lemonbar = callPackage ../applications/window-managers/lemonbar { };