commit fa417fe3f70bc446b3bb84b6028d00be954cf10d · pyrox.dev/nixpkgs

+10 -1

pkgs/by-name/dt/dtc/package.nix

···

       11
       11
        
         which,

     

       12
       12
        
         pythonSupport ? false,

     

       13
       13
        
         python ? null,

     

       14
       14
       +
         replaceVars,

     

       14
       15
        
         swig,

     

       15
       16
        
         libyaml,

     

       16
       17
        
       }:

     
···

       38
       39
        
             url = "https://github.com/dgibson/dtc/commit/ce1d8588880aecd7af264e422a16a8b33617cef7.patch";

     

       39
       40
        
             hash = "sha256-t1CxKnbCXUArtVcniAIdNvahOGXPbYhPCZiTynGLvfo=";

     

       40
       41
        
           })

     

       41
       41
       -
         ];

     

       42
       42
       +
         ]

     

       43
       43
       +
         ++

     

       44
       44
       +
           lib.optional pythonSupport

     

       45
       45
       +
             # Make Meson use our Python version, not the one it was built with itself

     

       46
       46
       +
             (

     

       47
       47
       +
               replaceVars ./python-path.patch {

     

       48
       48
       +
                 python_bin = lib.getExe python;

     

       49
       49
       +
               }

     

       50
       50
       +
             );

     

       42
       51
        
       

     

       43
       52
        
         env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;

     

       44
       53

+12

pkgs/by-name/dt/dtc/python-path.patch

···

       1
       1
       +
       diff --git a/meson.build b/meson.build

     

       2
       2
       +
       index 310699f..4e2b8a4 100644

     

       3
       3
       +
       --- a/meson.build

     

       4
       4
       +
       +++ b/meson.build

     

       5
       5
       +
       @@ -48,7 +48,7 @@ if not valgrind.found()

     

       6
       6
       +
        endif

     

       7
       7
       +
        

     

       8
       8
       +
        py = import('python')

     

       9
       9
       +
       -py = py.find_installation(required: get_option('python'))

     

       10
       10
       +
       +py = py.find_installation('@python_bin@', required: get_option('python'))

     

       11
       11
       +
        swig = find_program('swig', required: get_option('python'))

     

       12
       12
       +
        pylibfdt_enabled = not meson.is_cross_build() and py.found() and swig.found() ? true : false