From bcda17cdff3643a31966cd462c3d98d77519d4f8 Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Mon, 23 Dec 2024 12:58:00 -0600 Subject: [PATCH 1/2] skia: fix skia dynamic linking --- pkgs/by-name/sk/skia/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix index 887cd8ccdcfc..cd7c5707520c 100644 --- a/pkgs/by-name/sk/skia/package.nix +++ b/pkgs/by-name/sk/skia/package.nix @@ -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 From 9dfb922a3577cab1e283c8e815163e546c463f7e Mon Sep 17 00:00:00 2001 From: Caleb Norton Date: Mon, 23 Dec 2024 12:58:41 -0600 Subject: [PATCH 2/2] ladybird: Update darwin sdk version --- .../networking/browsers/ladybird/default.nix | 14 ++++---------- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 1d80cfc82b67..87a8b1bb5bb6 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -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; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a2b20cba661..786e47d1235a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14499,10 +14499,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 { };