2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-25 06:13:54 +00:00

Merge pull request from NickCao/meson

meson: 0.64.1 -> 1.0.0
This commit is contained in:
Nick Cao 2023-01-29 06:49:09 +08:00 committed by GitHub
commit 3a6a33481b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,16 +4,18 @@
, ninja
, pkg-config
, python3
, zlib
, coreutils
, substituteAll
}:
python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "0.64.1";
version = "1.0.0";
src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-Oo4DDCM094IIX4FicGLMbUpnce3zHgVf/jdPnmsImrk=";
hash = "sha256-qlCkukVXwl59SERqv96FeVfc31g4X/++Zwug6O+szgU=";
};
patches = [
@ -61,17 +63,31 @@ python3.pkgs.buildPythonApplication rec {
"docs/yaml/objects/dep.yaml"
];
})
# tests: avoid unexpected failure when cmake is not installed
# https://github.com/mesonbuild/meson/pull/11321
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/a38ad3039d0680f3ac34a6dc487776c79c48acf3.patch";
hash = "sha256-9YaXwc+F3Pw4BjuOXqva4MD6DAxX1k5WLbn0xzwuEmw=";
})
];
setupHook = ./setup-hook.sh;
# Meson included tests since 0.45, however they fail in Nixpkgs because they
# require a typical building environment (including C compiler and stuff).
# Just for the sake of documentation, the next lines are maintained here.
doCheck = false;
nativeCheckInputs = [ ninja pkg-config ];
checkInputs = [ zlib ];
checkPhase = ''
python ./run_project_tests.py
patchShebangs "test cases"
substituteInPlace "test cases/native/8 external program shebang parsing/script.int.in" \
--replace /usr/bin/env ${coreutils}/bin/env
# requires git, creating cyclic dependency
rm -r "test cases/common/66 vcstag"
# requires glib, creating cyclic dependency
rm -r "test cases/linuxlike/6 subdir include order"
rm -r "test cases/linuxlike/9 compiler checks with dependencies"
# requires static zlib, see #66461
rm -r "test cases/linuxlike/14 static dynamic linkage"
HOME="$TMPDIR" python ./run_project_tests.py
'';
postFixup = ''