nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #262816 from reckenrode/kivy-fix

Browse Source 
python3Packages.kivy: fix build on Darwin
This commit is contained in:
Weijia Wang 2023-10-23 17:53:19 +02:00 committed by GitHub
commit eae5987358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/kivy/default.nix
View File

@ -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
@ -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
@ -35,6 +44,7 @@ buildPythonPackage rec {
mesa
mtdev
] ++ lib.optionals stdenv.isDarwin [
Accelerate
ApplicationServices
AVFoundation
libcxx

2
pkgs/top-level/python-packages.nix
View File

@ -5937,7 +5937,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 { };