From 939606a99ce0eaf217d047302885ae14aea605d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 7 Dec 2022 22:44:21 +0100 Subject: [PATCH] wbg: use lib.mesonEnable --- pkgs/applications/misc/wbg/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/wbg/default.nix b/pkgs/applications/misc/wbg/default.nix index 0febd846e02..d5f95961f37 100644 --- a/pkgs/applications/misc/wbg/default.nix +++ b/pkgs/applications/misc/wbg/default.nix @@ -16,12 +16,6 @@ , libjpeg }: -let - # Courtesy of sternenseemann and FRidh, commit c9a7fdfcfb420be8e0179214d0d91a34f5974c54 - mesonFeatureFlag = feature: flag: - "-D${feature}=${if flag then "enabled" else "disabled"}"; -in - stdenv.mkDerivation rec { pname = "wbg"; version = "1.0.2"; @@ -52,8 +46,8 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; mesonFlags = [ - (mesonFeatureFlag "png" enablePNG) - (mesonFeatureFlag "jpeg" enableJPEG) + (lib.mesonEnable "png" enablePNG) + (lib.mesonEnable "jpeg" enableJPEG) ]; meta = with lib; {