commit 3a6a33481bce24390dca91c7cb76bea70690acff · pyrox.dev/nixpkgs

+23 -7
pkgs/development/tools/build-managers/meson/default.nix
···

       4
       4
        
       , ninja

     

       5
       5
        
       , pkg-config

     

       6
       6
        
       , python3

     

       7
       7
       +
       , zlib

     

       8
       8
       +
       , coreutils

     

       7
       9
        
       , substituteAll

     

       8
       10
        
       }:

     

       9
       11
        
       

     

       10
       12
        
       python3.pkgs.buildPythonApplication rec {

     

       11
       13
        
         pname = "meson";

     

       12
       12
       -
         version = "0.64.1";

     

       14
       14
       +
         version = "1.0.0";

     

       13
       15
        
       

     

       14
       16
        
         src = python3.pkgs.fetchPypi {

     

       15
       17
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-Oo4DDCM094IIX4FicGLMbUpnce3zHgVf/jdPnmsImrk=";

     

       18
       18
       +
           hash = "sha256-qlCkukVXwl59SERqv96FeVfc31g4X/++Zwug6O+szgU=";

     

       17
       19
        
         };

     

       18
       20
        
       

     

       19
       21
        
         patches = [

     
···

       61
       63
        
               "docs/yaml/objects/dep.yaml"

     

       62
       64
        
             ];

     

       63
       65
        
           })

     

       66
       66
       +
       

     

       67
       67
       +
           # tests: avoid unexpected failure when cmake is not installed

     

       68
       68
       +
           # https://github.com/mesonbuild/meson/pull/11321

     

       69
       69
       +
           (fetchpatch {

     

       70
       70
       +
             url = "https://github.com/mesonbuild/meson/commit/a38ad3039d0680f3ac34a6dc487776c79c48acf3.patch";

     

       71
       71
       +
             hash = "sha256-9YaXwc+F3Pw4BjuOXqva4MD6DAxX1k5WLbn0xzwuEmw=";

     

       72
       72
       +
           })

     

       64
       73
        
         ];

     

       65
       74
        
       

     

       66
       75
        
         setupHook = ./setup-hook.sh;

     

       67
       76
        
       

     

       68
       68
       -
         # Meson included tests since 0.45, however they fail in Nixpkgs because they

     

       69
       69
       -
         # require a typical building environment (including C compiler and stuff).

     

       70
       70
       -
         # Just for the sake of documentation, the next lines are maintained here.

     

       71
       71
       -
         doCheck = false;

     

       72
       77
        
         nativeCheckInputs = [ ninja pkg-config ];

     

       78
       78
       +
         checkInputs = [ zlib ];

     

       73
       79
        
         checkPhase = ''

     

       74
       74
       -
           python ./run_project_tests.py

     

       80
       80
       +
           patchShebangs "test cases"

     

       81
       81
       +
           substituteInPlace "test cases/native/8 external program shebang parsing/script.int.in" \

     

       82
       82
       +
             --replace /usr/bin/env ${coreutils}/bin/env

     

       83
       83
       +
           # requires git, creating cyclic dependency

     

       84
       84
       +
           rm -r "test cases/common/66 vcstag"

     

       85
       85
       +
           # requires glib, creating cyclic dependency

     

       86
       86
       +
           rm -r "test cases/linuxlike/6 subdir include order"

     

       87
       87
       +
           rm -r "test cases/linuxlike/9 compiler checks with dependencies"

     

       88
       88
       +
           # requires static zlib, see #66461

     

       89
       89
       +
           rm -r "test cases/linuxlike/14 static dynamic linkage"

     

       90
       90
       +
           HOME="$TMPDIR" python ./run_project_tests.py

     

       75
       91
        
         '';

     

       76
       92
        
       

     

       77
       93
        
         postFixup = ''