From 9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 29 Jun 2022 21:29:59 +0200
Subject: [PATCH] libfinity: replace mkFlag with lib.withFeature

---
 .../libraries/libinfinity/default.nix            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index 4b379660a84e..f9963ce3e636 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -9,8 +9,6 @@ assert avahiSupport -> avahi != null;
 assert gtkWidgets -> gtk3 != null;
 
 let
-  mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;
-
   self = stdenv.mkDerivation rec {
     pname = "libinfinity";
     version = "0.7.2";
@@ -29,13 +27,13 @@ let
     propagatedBuildInputs = [ gnutls ];
 
     configureFlags = [
-      "--enable-gtk-doc"
-      "--enable-introspection"
-      (mkFlag gtkWidgets "inftextgtk")
-      (mkFlag gtkWidgets "infgtk")
-      "--with-infinoted"
-      "--with-libdaemon"
-      (mkFlag avahiSupport "avahi")
+      (lib.enableFeature true "gtk-doc")
+      (lib.enableFeature true "introspection")
+      (lib.withFeature gtkWidgets "inftextgtk")
+      (lib.withFeature gtkWidgets "infgtk")
+      (lib.withFeature true "infinoted")
+      (lib.withFeature true "libdaemon")
+      (lib.withFeature avahiSupport "avahi")
     ];
 
     passthru = {