diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-22 13:33:08 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-22 13:54:52 -0700 |
| commit | 3117e0c897522ec8431572de12449f676cc8c8be (patch) | |
| tree | c3b55ca870549d87bb52e9b0e173ff1bd3b902df /pkgs/development/libraries/libwebp | |
| parent | 25a148fa196b944b3f134527da87e43d88c066f9 (diff) | |
| download | nixpkgs-3117e0c897522ec8431572de12449f676cc8c8be.tar nixpkgs-3117e0c897522ec8431572de12449f676cc8c8be.tar.gz nixpkgs-3117e0c897522ec8431572de12449f676cc8c8be.tar.bz2 nixpkgs-3117e0c897522ec8431572de12449f676cc8c8be.tar.lz nixpkgs-3117e0c897522ec8431572de12449f676cc8c8be.tar.xz nixpkgs-3117e0c897522ec8431572de12449f676cc8c8be.tar.zst nixpkgs-3117e0c897522ec8431572de12449f676cc8c8be.zip | |
Refactor mkFlag out of old packages
Diffstat (limited to 'pkgs/development/libraries/libwebp')
| -rw-r--r-- | pkgs/development/libraries/libwebp/default.nix | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 6da1b00ee81..871dff0aa8a 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -20,10 +20,6 @@ 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}"; @@ -35,19 +31,19 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (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") + (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) ]; buildInputs = [ ] |