diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/meson')
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch | 12 |
2 files changed, 2 insertions, 18 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 298c669e690b..6022b645172c 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -2,13 +2,13 @@ targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.45.1"; + version = "0.46.1"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14"; + sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc"; }; postFixup = '' @@ -43,10 +43,6 @@ in python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) - - # No one will ever need more than 128 bytes of data structure - # https://github.com/mesonbuild/meson/issues/3113 - ./overly-strict-size-check.patch ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch deleted file mode 100644 index ea0e9bcd7eac..000000000000 --- a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py ---- a/mesonbuild/compilers/c.py 2017-12-10 08:37:19.000000000 -0500 -+++ b/mesonbuild/compilers/c.py 2018-03-24 07:46:04.739929307 -0400 -@@ -406,7 +406,7 @@ - }}''' - if not self.compiles(t.format(**fargs), env, extra_args, dependencies): - return -1 -- return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies) -+ return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies) - - def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None): - if extra_args is None: |