Merge pull request #201099 from atorres1985-contrib/mesonFeatureFlag

wbg, fcf, harfbuzz: cosmetical changes

Changed files
+6 -4
pkgs
applications
misc
development
libraries
fcft
harfbuzz
+2 -1
pkgs/applications/misc/wbg/default.nix
···
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 {
+2 -1
pkgs/development/libraries/fcft/default.nix
···
];
# 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 {
+2 -2
pkgs/development/libraries/harfbuzz/default.nix
···
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 {