From 5d8fe045b6376851c33a1c772cfe46882411cd21 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Jun 2015 21:29:47 +0200
Subject: Revert "Refactor mkFlag out of old packages"

This reverts commit 3117e0c897522ec8431572de12449f676cc8c8be.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
---
 pkgs/development/libraries/libwebp/default.nix | 30 +++++++++++++++-----------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'pkgs/development/libraries/libwebp')

diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index 871dff0aa8a..6da1b00ee81 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -20,6 +20,10 @@ assert jpegSupport -> (libjpeg != null);
 assert tiffSupport -> (libtiff != null);
 assert gifSupport -> (giflib != null);
 
+let
+  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+in
+
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libwebp-${version}";
@@ -31,19 +35,19 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [
-    (mkEnable threadingSupport "threading" null)
-    (mkEnable openglSupport "gl" null)
-    (mkEnable pngSupport "png" null)
-    (mkEnable jpegSupport "jpeg" null)
-    (mkEnable tiffSupport "tiff" null)
-    (mkEnable gifSupport "gif" null)
-    #(mkEnable (wicSupport && stdenv.isCygwin) "wic" null)
-    (mkEnable alignedSupport "aligned" null)
-    (mkEnable swap16bitcspSupport "swap-16bit-csp" null)
-    (mkEnable experimentalSupport "experimental" null)
-    (mkEnable libwebpmuxSupport "libwebpmux" null)
-    (mkEnable libwebpdemuxSupport "libwebpdemux" null)
-    (mkEnable libwebpdecoderSupport "libwebpdecoder" null)
+    (mkFlag threadingSupport "threading")
+    (mkFlag openglSupport "gl")
+    (mkFlag pngSupport "png")
+    (mkFlag jpegSupport "jpeg")
+    (mkFlag tiffSupport "tiff")
+    (mkFlag gifSupport "gif")
+    #(mkFlag (wicSupport && stdenv.isCygwin) "wic")
+    (mkFlag alignedSupport "aligned")
+    (mkFlag swap16bitcspSupport "swap-16bit-csp")
+    (mkFlag experimentalSupport "experimental")
+    (mkFlag libwebpmuxSupport "libwebpmux")
+    (mkFlag libwebpdemuxSupport "libwebpdemux")
+    (mkFlag libwebpdecoderSupport "libwebpdecoder")
   ];
 
   buildInputs = [ ]
-- 
cgit 1.4.1