diff options
author | Pavol Rusnak <pavol@rusnak.io> | 2022-06-29 21:29:59 +0200 |
---|---|---|
committer | Pavol Rusnak <pavol@rusnak.io> | 2022-07-09 13:32:45 +0200 |
commit | 9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003 (patch) | |
tree | 96a94b195b8e3f2b1ca83d2d6019acfa18c77f2d | |
parent | 37d847197431b24bd2183627850916c5cb842005 (diff) | |
download | nixpkgs-9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003.tar nixpkgs-9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003.tar.gz nixpkgs-9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003.tar.bz2 nixpkgs-9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003.tar.lz nixpkgs-9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003.tar.xz nixpkgs-9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003.tar.zst nixpkgs-9d0d1d499ef0919a2bd3ec97cbad9dcd08d5f003.zip |
libfinity: replace mkFlag with lib.withFeature
-rw-r--r-- | pkgs/development/libraries/libinfinity/default.nix | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 4b379660a84..f9963ce3e63 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 = { |