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/libass | |
| parent | 17b6a597fb36063e4832983d3470ce695f809b31 (diff) | |
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/libass')
| -rw-r--r-- | pkgs/development/libraries/libass/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 502f95dca9a4..ab300729accf 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -11,6 +11,10 @@ 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}"; @@ -22,11 +26,11 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkEnable encaSupport "enca" null) - (mkEnable fontconfigSupport "fontconfig" null) - (mkEnable harfbuzzSupport "harfbuzz" null) - (mkEnable rasterizerSupport "rasterizer" null) - (mkEnable largeTilesSupport "large-tiles" null) + (mkFlag encaSupport "enca") + (mkFlag fontconfigSupport "fontconfig") + (mkFlag harfbuzzSupport "harfbuzz") + (mkFlag rasterizerSupport "rasterizer") + (mkFlag largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkgconfig yasm ]; |