Unverified Commit 5e876613 authored by Anderson Torres's avatar Anderson Torres Committed by GitHub
Browse files

Merge pull request #201099 from atorres1985-contrib/mesonFeatureFlag 

wbg, fcf, harfbuzz: cosmetical changes
parents 242c648f 2f52d4fa

pkgs/applications/misc/wbg/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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 {

pkgs/development/libraries/fcft/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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 {

pkgs/development/libraries/harfbuzz/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 {