about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-06-19 03:17:42 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-06-25 18:24:51 +0200
commite529ec326338f660d14fa220b8440d5613d464a0 (patch)
tree6ea5b4a0599bd28d6968fcb9dd3b99e62c0b9af0 /pkgs
parent85483ca76a045b309e514935c142fe97644fdf51 (diff)
downloadnixlib-e529ec326338f660d14fa220b8440d5613d464a0.tar
nixlib-e529ec326338f660d14fa220b8440d5613d464a0.tar.gz
nixlib-e529ec326338f660d14fa220b8440d5613d464a0.tar.bz2
nixlib-e529ec326338f660d14fa220b8440d5613d464a0.tar.lz
nixlib-e529ec326338f660d14fa220b8440d5613d464a0.tar.xz
nixlib-e529ec326338f660d14fa220b8440d5613d464a0.tar.zst
nixlib-e529ec326338f660d14fa220b8440d5613d464a0.zip
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
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/tools/build-managers/meson/setup-hook.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh
index 06375c1528e0..7e2da2077e37 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"