diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-13 17:25:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-13 17:25:09 +0200 |
| commit | 0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4 (patch) | |
| tree | 52f11f99812f79145cbdf04efa0cdf0973336b20 | |
| parent | 60a9ea4015d2a8354f3a0b72e8925d411a80e3f5 (diff) | |
| parent | 6f0c92fda98f2acc836df6bc80fe69dec9e66a27 (diff) | |
| download | nixlib-0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4.tar nixlib-0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4.tar.gz nixlib-0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4.tar.bz2 nixlib-0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4.tar.lz nixlib-0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4.tar.xz nixlib-0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4.tar.zst nixlib-0a7741110ca7ceba76d4d0a7a83dbd823c3c7cf4.zip | |
Merge pull request #42994 from r-ryantm/auto-update/meson
meson: 0.46.1 -> 0.47.0
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/build-managers/meson/setup-hook.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index f14f6adf5fef..c0af01929785 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -2,12 +2,12 @@ targetPrefix = lib.optionalString stdenv.isCross (targetPlatform.config + "-"); in python3Packages.buildPythonApplication rec { - version = "0.46.1"; + version = "0.47.0"; pname = "meson"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc"; + sha256 = "1mxsvsw7mg3q4yj8qrkrwv79qwws14qnbihryn2i7504b3r204h6"; }; postFixup = '' diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 36a7fe23ef5b..b98225c1305f 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -17,6 +17,7 @@ mesonConfigurePhase() { --includedir=${!outputInclude}/include \ --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ --localedir=${!outputLib}/share/locale \ + -Dauto_features=disabled \ $mesonFlags" mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags" |