JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #98228 from jtojnar/meson-0.55.3

Browse Source 
meson: 0.55.1 → 0.55.3
This commit is contained in:
Jan Tojnar 2020-09-24 22:49:25 +02:00 committed by GitHub
commit 17f5821f94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/build-managers/meson/default.nix
View File

@ -9,21 +9,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "meson";
version = "0.55.1";
version = "0.55.3";
src = python3.pkgs.fetchPypi {
inherit pname version;
sha256 = "O1dB+ITgSSi9+hlHRn/wavpsmOYjwlzvda33HKOc4IA=";
sha256 = "19cjy24mfaswxyvqmns6rd7hx05ybqb663zlgklspfr8l4jjmvbb";
};
patches = [
# Meson 0.55.0 incorrectly considers skipped tests as failures,
# which makes some packages like gjs fail to build.
(fetchpatch {
url = "https://github.com/mesonbuild/meson/commit/7db49db67d4aa7582cf46feb7157235e66aa95b1.diff";
sha256 = "1chq52sgk24afdlswssr8n8p6fa2wz8rjlxvkjhpqg1kg3qnqc9p";
})
# Upstream insists on not allowing bindir and other dir options
# outside of prefix for some reason:
# https://github.com/mesonbuild/meson/issues/2561