mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-24 22:20:17 +02:00
meson: 0.45.1 → 0.46.1
This commit is contained in:
parent
4a906efce5
commit
405cb86037
|
@ -2,13 +2,13 @@
|
||||||
targetPrefix = lib.optionalString stdenv.isCross
|
targetPrefix = lib.optionalString stdenv.isCross
|
||||||
(targetPlatform.config + "-");
|
(targetPlatform.config + "-");
|
||||||
in python3Packages.buildPythonApplication rec {
|
in python3Packages.buildPythonApplication rec {
|
||||||
version = "0.45.1";
|
version = "0.46.1";
|
||||||
pname = "meson";
|
pname = "meson";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
|
|
||||||
src = python3Packages.fetchPypi {
|
src = python3Packages.fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14";
|
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
|
||||||
};
|
};
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
|
@ -43,10 +43,6 @@ in python3Packages.buildPythonApplication rec {
|
||||||
src = ./fix-rpath.patch;
|
src = ./fix-rpath.patch;
|
||||||
inherit (builtins) storeDir;
|
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;
|
setupHook = ./setup-hook.sh;
|
||||||
|
|
|
@ -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:
|
|
Loading…
Reference in a new issue