pyrox.dev / nixpkgs
lol
fork atom

ladybird: Update darwin sdk version (#361319)

authored by Francesco Gazzetta and committed by GitHub 83c2a905 403dfb7c

+12 -15
unified split
+4 -10
pkgs/applications/networking/browsers/ladybird/default.nix
··· 19 , qt6Packages 20 , woff2 21 , ffmpeg 22 , simdutf 23 , skia 24 , nixosTests 25 - , AppKit 26 - , Cocoa 27 - , Foundation 28 - , OpenGL 29 , unstableGitUpdater 30 }: 31 32 let ··· 107 buildInputs = with qt6Packages; [ 108 curl 109 ffmpeg 110 libavif 111 libjxl 112 libwebp ··· 120 libpulseaudio.dev 121 qtwayland 122 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 123 - AppKit 124 - Cocoa 125 - Foundation 126 - OpenGL 127 ]; 128 129 cmakeFlags = [ ··· 158 maintainers = with maintainers; [ fgaz ]; 159 platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 160 mainProgram = "Ladybird"; 161 - # use of undeclared identifier 'NSBezelStyleAccessoryBarAction' 162 - broken = stdenv.hostPlatform.isDarwin; 163 }; 164 })
··· 19 , qt6Packages 20 , woff2 21 , ffmpeg 22 + , fontconfig 23 , simdutf 24 , skia 25 , nixosTests 26 , unstableGitUpdater 27 + , apple-sdk_14 28 }: 29 30 let ··· 105 buildInputs = with qt6Packages; [ 106 curl 107 ffmpeg 108 + fontconfig 109 libavif 110 libjxl 111 libwebp ··· 119 libpulseaudio.dev 120 qtwayland 121 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 122 + apple-sdk_14 123 ]; 124 125 cmakeFlags = [ ··· 154 maintainers = with maintainers; [ fgaz ]; 155 platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; 156 mainProgram = "Ladybird"; 157 }; 158 })
+7 -1
pkgs/by-name/sk/skia/package.nix
··· 20 , cctools 21 , zlib 22 , apple-sdk_11 23 24 , enableVulkan ? !stdenv.hostPlatform.isDarwin 25 }: ··· 49 gn 50 ninja 51 python3 52 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild cctools.libtool zlib ]; 53 54 buildInputs = [ 55 expat
··· 20 , cctools 21 , zlib 22 , apple-sdk_11 23 + , fixDarwinDylibNames 24 25 , enableVulkan ? !stdenv.hostPlatform.isDarwin 26 }: ··· 50 gn 51 ninja 52 python3 53 + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ 54 + xcbuild 55 + cctools.libtool 56 + zlib 57 + fixDarwinDylibNames 58 + ]; 59 60 buildInputs = [ 61 expat
+1 -4
pkgs/top-level/all-packages.nix
··· 14395 14396 ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; 14397 14398 - ladybird = callPackage ../applications/networking/browsers/ladybird { 14399 - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; 14400 - inherit (darwin.apple_sdk_11_0.frameworks) AppKit Cocoa Foundation OpenGL; 14401 - }; 14402 14403 lemonbar = callPackage ../applications/window-managers/lemonbar { }; 14404
··· 14395 14396 ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { }; 14397 14398 + ladybird = callPackage ../applications/networking/browsers/ladybird { }; 14399 14400 lemonbar = callPackage ../applications/window-managers/lemonbar { }; 14401