commit 2edd3921c132dc48573bd95b95081e22ba468835 · pyrox.dev/nixpkgs

+10 -17

pkgs/development/python-modules/raylib-python-cffi/default.nix

···

       5
       5
        
         setuptools,

     

       6
       6
        
         cffi,

     

       7
       7
        
         pkg-config,

     

       8
       8
       -
         glfw,

     

       8
       8
       +
         glfw3,

     

       9
       9
        
         libffi,

     

       10
       10
        
         raylib,

     

       11
       11
        
         physac,

     
···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "raylib-python-cffi";

     

       20
       20
       -
         version = "5.5.0.2";

     

       20
       20
       +
         version = "5.5.0.3";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         src = fetchFromGitHub {

     

       24
       24
        
           owner = "electronstudio";

     

       25
       25
        
           repo = "raylib-python-cffi";

     

       26
       26
        
           tag = "v${version}";

     

       27
       27
       -
           hash = "sha256-Ls+9+iByGQJQJdJiW4WOmKPGbrWJDisXZ1ZYqvAj+3o=";

     

       27
       27
       +
           hash = "sha256-VsdUOk26xXEwha7kGYHy4Cgwrr3yOiSlJg4nYn+ZYYs=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         build-system = [ setuptools ];

     

       31
       31
        
         dependencies = [ cffi ];

     

       32
       32
        
       

     

       33
       33
       -
         patches = [

     

       34
       34
       -
           # This patch fixes to the builder script function to call pkg-config

     

       35
       35
       -
           # using the library name rather than searching only through raylib

     

       36
       36
       -
           ./fix_pyray_builder.patch

     

       33
       33
       +
         patches = [ ./use-direct-pkg-config-name.patch ];

     

       37
       34
        
       

     

       38
       38
       -
           # use get_lib_flags() instead of linking to libraylib.a directly

     

       39
       39
       -
           ./fix_macos_raylib.patch

     

       35
       35
       +
         buildInputs = [

     

       36
       36
       +
           glfw3

     

       37
       37
       +
           libffi

     

       38
       38
       +
           raylib

     

       39
       39
       +
           physac

     

       40
       40
       +
           raygui

     

       40
       41
        
         ];

     

       41
       42
        
       

     

       42
       43
        
         nativeBuildInputs = [

     
···

       48
       49
        
         doCheck = false;

     

       49
       50
        
       

     

       50
       51
        
         pythonImportsCheck = [ "pyray" ];

     

       51
       51
       -
       

     

       52
       52
       -
         buildInputs = [

     

       53
       53
       -
           glfw

     

       54
       54
       -
           libffi

     

       55
       55
       -
           raylib

     

       56
       56
       -
           physac

     

       57
       57
       -
           raygui

     

       58
       58
       -
         ];

     

       59
       52
        
       

     

       60
       53
        
         passthru.tests = import ./passthru-tests.nix {

     

       61
       54
        
           inherit src raylib-python-cffi writers;

-11

pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch

···

       1
       1
       -
       --- a/raylib/build.py

     

       2
       2
       -
       +++ b/raylib/build.py

     

       3
       3
       -
       @@ -158,7 +158,7 @@ def build_unix():

     

       4
       4
       -
       

     

       5
       5
       -
            if platform.system() == "Darwin":

     

       6
       6
       -
                print("BUILDING FOR MAC")

     

       7
       7
       -
       -        extra_link_args = [get_the_lib_path() + '/libraylib.a', '-framework', 'OpenGL', '-framework', 'Cocoa',

     

       8
       8
       -
       +        extra_link_args = get_lib_flags() + ['-framework', 'OpenGL', '-framework', 'Cocoa',

     

       9
       9
       -
                                   '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework',

     

       10
       10
       -
                                   'CoreVideo']

     

       11
       11
       -
                libraries = []

-62

pkgs/development/python-modules/raylib-python-cffi/fix_pyray_builder.patch

···

       1
       1
       -
       diff --git a/raylib/build.py b/raylib/build.py

     

       2
       2
       -
       index 81fa11a..943c34e 100644

     

       3
       3
       -
       --- a/raylib/build.py

     

       4
       4
       -
       +++ b/raylib/build.py

     

       5
       5
       -
       @@ -33,8 +33,8 @@ def check_raylib_installed():

     

       6
       6
       -
        def check_SDL_installed():

     

       7
       7
       -
            return subprocess.run(['pkg-config', '--exists', 'sdl2'], text=True, stdout=subprocess.PIPE).returncode == 0

     

       8
       8
       -
        

     

       9
       9
       -
       -def get_the_include_path():

     

       10
       10
       -
       -    return subprocess.run(['pkg-config', '--variable=includedir', 'raylib'], text=True,

     

       11
       11
       -
       +def get_the_include_path(libname):

     

       12
       12
       -
       +    return subprocess.run(['pkg-config', '--variable=includedir', libname], text=True,

     

       13
       13
       -
                                  stdout=subprocess.PIPE).stdout.strip()

     

       14
       14
       -
        

     

       15
       15
       -
        

     

       16
       16
       -
       @@ -110,9 +110,9 @@ def build_unix():

     

       17
       17
       -
            if RAYLIB_PLATFORM=="SDL" and not check_SDL_installed():

     

       18
       18
       -
                raise Exception("ERROR: SDL2 not found by pkg-config.  Please install pkg-config and SDL2.")

     

       19
       19
       -
        

     

       20
       20
       -
       -    raylib_h = get_the_include_path() + "/raylib.h"

     

       21
       21
       -
       -    rlgl_h = get_the_include_path() + "/rlgl.h"

     

       22
       22
       -
       -    raymath_h = get_the_include_path() + "/raymath.h"

     

       23
       23
       -
       +    raylib_h = get_the_include_path("raylib") + "/raylib.h"

     

       24
       24
       -
       +    rlgl_h = get_the_include_path("raylib") + "/rlgl.h"

     

       25
       25
       -
       +    raymath_h = get_the_include_path("raylib") + "/raymath.h"

     

       26
       26
       -
        

     

       27
       27
       -
            if not os.path.isfile(raylib_h):

     

       28
       28
       -
                raise Exception("ERROR: " + raylib_h + " not found.  Please install Raylib.")

     

       29
       29
       -
       @@ -129,13 +129,13 @@ def build_unix():

     

       30
       30
       -
            #include "raymath.h"

     

       31
       31
       -
            """

     

       32
       32
       -
        

     

       33
       33
       -
       -    glfw3_h = get_the_include_path() + "/GLFW/glfw3.h"

     

       34
       34
       -
       +    glfw3_h = get_the_include_path("glfw3") + "/GLFW/glfw3.h"

     

       35
       35
       -
            if RAYLIB_PLATFORM=="Desktop" and check_header_exists(glfw3_h):

     

       36
       36
       -
                ffi_includes += """

     

       37
       37
       -
                #include "GLFW/glfw3.h"

     

       38
       38
       -
                """

     

       39
       39
       -
        

     

       40
       40
       -
       -    raygui_h = get_the_include_path() + "/raygui.h"

     

       41
       41
       -
       +    raygui_h = get_the_include_path("raygui") + "/raygui.h"

     

       42
       42
       -
            if check_header_exists(raygui_h):

     

       43
       43
       -
                ffi_includes += """

     

       44
       44
       -
                #define RAYGUI_IMPLEMENTATION

     

       45
       45
       -
       @@ -143,7 +143,7 @@ def build_unix():

     

       46
       46
       -
                #include "raygui.h"

     

       47
       47
       -
                """

     

       48
       48
       -
        

     

       49
       49
       -
       -    physac_h = get_the_include_path() + "/physac.h"

     

       50
       50
       -
       +    physac_h = get_the_include_path("physac") + "/physac.h"

     

       51
       51
       -
            if check_header_exists(physac_h):

     

       52
       52
       -
                ffi_includes += """

     

       53
       53
       -
                #define PHYSAC_IMPLEMENTATION

     

       54
       54
       -
       @@ -192,7 +192,7 @@ def build_unix():

     

       55
       55
       -
            ffibuilder.set_source("raylib._raylib_cffi",

     

       56
       56
       -
                                  ffi_includes,

     

       57
       57
       -
                                  py_limited_api=False,

     

       58
       58
       -
       -                          include_dirs=[get_the_include_path()],

     

       59
       59
       -
       +                          include_dirs=[get_the_include_path("libffi")],

     

       60
       60
       -
                                  extra_link_args=extra_link_args,

     

       61
       61
       -
                                  extra_compile_args=extra_compile_args,

     

       62
       62
       -
                                  libraries=libraries)

+13

pkgs/development/python-modules/raylib-python-cffi/use-direct-pkg-config-name.patch

···

       1
       1
       +
       diff --git a/raylib/build.py b/raylib/build.py

     

       2
       2
       +
       index d6d0823..af2b274 100644

     

       3
       3
       +
       --- a/raylib/build.py

     

       4
       4
       +
       +++ b/raylib/build.py

     

       5
       5
       +
       @@ -68,7 +68,7 @@ def check_sdl_pkgconfig_installed():

     

       6
       6
       +
        

     

       7
       7
       +
        def get_the_include_path_from_pkgconfig(libname):

     

       8
       8
       +
            return subprocess.run(

     

       9
       9
       +
       -        ['pkg-config', '--variable=includedir', os.environ.get("PKG_CONFIG_LIB_" + libname, 'raylib')], text=True,

     

       10
       10
       +
       +        ['pkg-config', '--variable=includedir', libname], text=True,

     

       11
       11
       +
                stdout=subprocess.PIPE).stdout.strip()

     

       12
       12
       +
        

     

       13
       13
       +