Refactor mkFlag out of old packages

1 files changed, 5 insertions, 9 deletions

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 2a9af50fcde9..77742c3d6259 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -13,10 +13,6 @@ assert encaSupport -> (enca != null);
 assert fontconfigSupport -> (fontconfig != null);
 assert harfbuzzSupport -> (harfbuzz != null);
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
@@ -28,11 +24,11 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkFlag encaSupport "enca")
-    (mkFlag fontconfigSupport "fontconfig")
-    (mkFlag harfbuzzSupport "harfbuzz")
-    (mkFlag rasterizerSupport "rasterizer")
-    (mkFlag largeTilesSupport "large-tiles")
+    (mkEnable encaSupport       "enca"        null)
+    (mkEnable fontconfigSupport "fontconfig"  null)
+    (mkEnable harfbuzzSupport   "harfbuzz"    null)
+    (mkEnable rasterizerSupport "rasterizer"  null)
+    (mkEnable largeTilesSupport "large-tiles" null)
   ];
 
   nativeBuildInputs = [ pkgconfig yasm ];