diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-01 21:29:47 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-04 14:54:50 +0200 |
| commit | 5d8fe045b6376851c33a1c772cfe46882411cd21 (patch) | |
| tree | 6f80e10e2ec11cfed92207ef87082a4ae3e1666e /pkgs/development/libraries/libwebp | |
| parent | 17b6a597fb36063e4832983d3470ce695f809b31 (diff) | |
| download | nixpkgs-5d8fe045b6376851c33a1c772cfe46882411cd21.tar nixpkgs-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.gz nixpkgs-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.bz2 nixpkgs-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.lz nixpkgs-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.xz nixpkgs-5d8fe045b6376851c33a1c772cfe46882411cd21.tar.zst nixpkgs-5d8fe045b6376851c33a1c772cfe46882411cd21.zip | |
Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897522ec8431572de12449f676cc8c8be. Conflicts: pkgs/development/libraries/wayland/default.nix pkgs/servers/samba/4.x.nix
Diffstat (limited to 'pkgs/development/libraries/libwebp')
| -rw-r--r-- | pkgs/development/libraries/libwebp/default.nix | 30 |
1 files changed, 17 insertions, 13 deletions
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 = [ ] |