commit 22f2052ca1e7b7cfb4b090faa2d924c3e27e4742 · pyrox.dev/nixpkgs

-4

pkgs/development/interpreters/python/cpython/2.7/default.nix

···

       140
        
           ] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [

     

       141
        
             ./use-correct-tcl-tk-on-darwin.patch

     

       142
        
       

     

       143
       -
           ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       144
       -
             # Fix darwin build https://bugs.python.org/issue34027

     

       145
       -
             ../3.7/darwin-libutil.patch

     

       146
       -
       

     

       147
        
           ] ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       148
        
       

     

       149
        
             # Disable the use of ldconfig in ctypes.util.find_library (since

···

       140
        
           ] ++ lib.optionals (x11Support && stdenv.hostPlatform.isDarwin) [

     

       141
        
             ./use-correct-tcl-tk-on-darwin.patch

     

       142
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       143
        
           ] ++ lib.optionals stdenv.hostPlatform.isLinux [

     

       144
        
       

     

       145
        
             # Disable the use of ldconfig in ctypes.util.find_library (since

-13

pkgs/development/interpreters/python/cpython/3.11/darwin-libutil.patch

···

       1
       -
       diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c

     

       2
       -
       index 40229bce0f..3cc604930e 100644

     

       3
       -
       --- a/Modules/posixmodule.c

     

       4
       -
       +++ b/Modules/posixmodule.c

     

       5
       -
       @@ -7258,7 +7258,7 @@ os_sched_getaffinity_impl(PyObject *module, pid_t pid)

     

       6
       -
        #ifdef HAVE_UTMP_H

     

       7
       -
        #include <utmp.h>

     

       8
       -
        #endif /* HAVE_UTMP_H */

     

       9
       -
       -#elif defined(HAVE_LIBUTIL_H)

     

       10
       -
       +#elif defined(HAVE_LIBUTIL_H) && !defined(__APPLE__)

     

       11
       -
        #include <libutil.h>

     

       12
       -
        #elif defined(HAVE_UTIL_H)

     

       13
       -
        #include <util.h>

-23

pkgs/development/interpreters/python/cpython/3.7/darwin-libutil.patch

···

       1
       -
       diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c

     

       2
       -
       index c3682b4..16826c6 100644

     

       3
       -
       --- a/Modules/posixmodule.c

     

       4
       -
       +++ b/Modules/posixmodule.c

     

       5
       -
       @@ -5880,15 +5880,13 @@ error:

     

       6
       -
        #if defined(HAVE_OPENPTY) || defined(HAVE_FORKPTY) || defined(HAVE_DEV_PTMX)

     

       7
       -
        #ifdef HAVE_PTY_H

     

       8
       -
        #include <pty.h>

     

       9
       -
       -#else

     

       10
       -
       +#endif

     

       11
       -
        #ifdef HAVE_LIBUTIL_H

     

       12
       -
        #include <libutil.h>

     

       13
       -
       -#else

     

       14
       -
       +#endif

     

       15
       -
        #ifdef HAVE_UTIL_H

     

       16
       -
        #include <util.h>

     

       17
       -
       -#endif /* HAVE_UTIL_H */

     

       18
       -
       -#endif /* HAVE_LIBUTIL_H */

     

       19
       -
       -#endif /* HAVE_PTY_H */

     

       20
       -
       +#endif

     

       21
       -
        #ifdef HAVE_STROPTS_H

     

       22
       -
        #include <stropts.h>

     

       23
       -
        #endif

-5

pkgs/development/interpreters/python/cpython/default.nix

···

       271
        
         ] ++ optionals mimetypesSupport [

     

       272
        
           # Make the mimetypes module refer to the right file

     

       273
        
           ./mimetypes.patch

     

       274
       -
         ] ++ optionals (pythonAtLeast "3.7" && pythonOlder "3.11") [

     

       275
       -
           # Fix darwin build https://bugs.python.org/issue34027

     

       276
       -
           ./3.7/darwin-libutil.patch

     

       277
       -
         ] ++ optionals (pythonAtLeast "3.11") [

     

       278
       -
           ./3.11/darwin-libutil.patch

     

       279
        
         ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [

     

       280
        
           # Stop checking for TCL/TK in global macOS locations

     

       281
        
           ./3.9/darwin-tcl-tk.patch

···

       271
        
         ] ++ optionals mimetypesSupport [

     

       272
        
           # Make the mimetypes module refer to the right file

     

       273
        
           ./mimetypes.patch

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       274
        
         ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.hostPlatform.isDarwin) [

     

       275
        
           # Stop checking for TCL/TK in global macOS locations

     

       276
        
           ./3.9/darwin-tcl-tk.patch