Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python3Packages.kivy: fix build on Darwin #262816

Merged
merged 1 commit into from
Oct 23, 2023
Merged

python3Packages.kivy: fix build on Darwin #262816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion pkgs/development/python-modules/kivy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, pkg-config, cython, docutils
, kivy-garden
, mesa, mtdev, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer
, ApplicationServices, AVFoundation, libcxx
, Accelerate, ApplicationServices, AVFoundation, libcxx
, withGstreamer ? true
, gst_all_1
, pillow, requests, pygments
Expand All @@ -20,6 +20,15 @@ buildPythonPackage rec {
hash = "sha256-k9LIiLtlHY6H1xfVylI/Xbm7R6pCpC5UHe8GWnCwEGA=";
};

patches = [
# Fixes incompatible function pointer conversion errors with clang 16.
# https://github.com/kivy/kivy/pull/8415
(fetchpatch {
url = "https://github.com/kivy/kivy/commit/a0ec8ff79fcbc1b82391132a89c8fc21ef1c5c55.patch";
hash = "sha256-2Kpkx75uWPiEiEqkOxBKl3HENKUGVHbQV4haeI5Gl3A=";
})
];

nativeBuildInputs = [
pkg-config
cython
Expand All @@ -35,6 +44,7 @@ buildPythonPackage rec {
mesa
mtdev
] ++ lib.optionals stdenv.isDarwin [
Accelerate
ApplicationServices
AVFoundation
libcxx
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5910,7 +5910,7 @@ self: super: with self; {

kivy = callPackage ../development/python-modules/kivy {
inherit (pkgs) mesa;
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices AVFoundation;
inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate ApplicationServices AVFoundation;
};

kivy-garden = callPackage ../development/python-modules/kivy-garden { };
Expand Down