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/lame | |
| 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/lame')
| -rw-r--r-- | pkgs/development/libraries/lame/default.nix | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 4a61d188ef698..562e292791ab9 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -17,7 +17,7 @@ assert sndfileFileIOSupport -> (libsndfile != null); #assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null)); let - sndfileFileIO = if sndfileFileIOSupport then "sndfile" else "lame"; + mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; in with stdenv.lib; @@ -39,18 +39,17 @@ stdenv.mkDerivation rec { ++ optional sndfileFileIOSupport libsndfile; configureFlags = [ - (mkEnable nasmSupport "nasm" null) - (mkEnable cpmlSupport "cpml" null) - #(mkEnable efenceSupport "efence" null) - (mkWith true "fileio" sndfileFileIO) - (mkEnable analyzerHooksSupport "analyzer-hooks" null) - (mkEnable decoderSupport "decoder" null) - (mkEnable frontendSupport "frontend" null) - (mkEnable frontendSupport "dynamic-frontends" null) - #(mkEnable mp3xSupport "mp3x" null) - (mkEnable mp3rtpSupport "mp3rtp" null) - ] ++ optional debugSupport [ - (mkEnable true "debug" "alot") + (mkFlag nasmSupport "nasm") + (mkFlag cpmlSupport "cpml") + #(mkFlag efenceSupport "efence") + (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") + (mkFlag analyzerHooksSupport "analyzer-hooks") + (mkFlag decoderSupport "decoder") + (mkFlag frontendSupport "frontend") + (mkFlag frontendSupport "dynamic-frontends") + #(mkFlag mp3xSupport "mp3x") + (mkFlag mp3rtpSupport "mp3rtp") + (if debugSupport then "--enable-debug=alot" else "") ]; meta = { |