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

Merge pull request #42994 from r-ryantm/auto-update/meson 

meson: 0.46.1 -> 0.47.0
This commit is contained in:
Jan Tojnar 2018-07-13 17:25:09 +02:00 committed by GitHub
parent 60a9ea4015 6f0c92fda9
commit 0a7741110c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,12 +2,12 @@
targetPrefix = lib.optionalString stdenv.isCross targetPrefix = lib.optionalString stdenv.isCross
(targetPlatform.config + "-"); (targetPlatform.config + "-");
in python3Packages.buildPythonApplication rec { in python3Packages.buildPythonApplication rec {
version = "0.46.1"; version = "0.47.0";
pname = "meson"; pname = "meson";
src = python3Packages.fetchPypi { src = python3Packages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc"; sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6";
}; };
postFixup = '' postFixup = ''

1
pkgs/development/tools/build-managers/meson/setup-hook.sh
View File

@ -17,6 +17,7 @@ mesonConfigurePhase() {
--includedir=${!outputInclude}/include \ --includedir=${!outputInclude}/include \
--mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
--localedir=${!outputLib}/share/locale \ --localedir=${!outputLib}/share/locale \
-Dauto_features=disabled \
$mesonFlags" $mesonFlags"
mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"