From e529ec326338f660d14fa220b8440d5613d464a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 19 Jun 2019 03:17:42 +0200 Subject: [PATCH] meson: enable auto_features by default We disabled them by default when they were introduced in https://github.com/NixOS/nixpkgs/pull/42994 but enabling them probably makes more sense: https://github.com/NixOS/nixpkgs/pull/54398 https://github.com/NixOS/nixpkgs/pull/63491 --- pkgs/development/tools/build-managers/meson/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 06375c1528e..7e2da2077e3 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -17,7 +17,7 @@ mesonConfigurePhase() { --includedir=${!outputInclude}/include \ --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \ --localedir=${!outputLib}/share/locale \ - -Dauto_features=disabled \ + -Dauto_features=${mesonAutoFeatures:-enabled} \ $mesonFlags" mesonFlags="${crossMesonFlags+$crossMesonFlags }--buildtype=${mesonBuildType:-release} $mesonFlags"