From a2bca8092c2cf0d0408c2af43d7652338a652a96 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Nov 2022 20:01:44 -0300 Subject: [PATCH 1/3] wbg: rewrite mesonFeatureFlag This is merely cosmetical. --- pkgs/applications/misc/wbg/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/wbg/default.nix b/pkgs/applications/misc/wbg/default.nix index 57a1f55392aa..0febd846e024 100644 --- a/pkgs/applications/misc/wbg/default.nix +++ b/pkgs/applications/misc/wbg/default.nix @@ -18,7 +18,8 @@ let # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 - mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + mesonFeatureFlag = feature: flag: + "-D${feature}=${if flag then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { From 1405f8a944547109f1031a97c93c02ef96e590da Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Nov 2022 20:02:45 -0300 Subject: [PATCH 2/3] fcft: rewrite mesonFeatureFlag This is merely cosmetical. --- pkgs/development/libraries/fcft/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index ecc99092a905..5090df411c2f 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -15,7 +15,8 @@ let ]; # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 - mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; + mesonFeatureFlag = feature: flag: + "-D${feature}=${if flag then "enabled" else "disabled"}"; in stdenv.mkDerivation rec { From 2f52d4fae237d03ac98718e9279c075fdf85e622 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 13 Nov 2022 20:03:19 -0300 Subject: [PATCH 3/3] harfbuzz: rewrite mesonFeatureFlag This is merely cosmetical. --- pkgs/development/libraries/harfbuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 0bb6546543dc..5e892c1681c2 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -32,8 +32,8 @@ let version = "5.2.0"; inherit (lib) optional optionals optionalString; - mesonFeatureFlag = opt: b: - "-D${opt}=${if b then "enabled" else "disabled"}"; + mesonFeatureFlag = feature: flag: + "-D${feature}=${if flag then "enabled" else "disabled"}"; in stdenv.mkDerivation {