Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'

1 files changed, 14 insertions, 23 deletions

diff --git a/nixpkgs/pkgs/development/libraries/lame/default.nix b/nixpkgs/pkgs/development/libraries/lame/default.nix
index 8ed0962bece8..674defc42e2a 100644
--- a/nixpkgs/pkgs/development/libraries/lame/default.nix
+++ b/nixpkgs/pkgs/development/libraries/lame/default.nix
@@ -1,25 +1,16 @@
 { lib, stdenv, fetchurl
-, nasmSupport ? true, nasm ? null # Assembly optimizations
+, nasmSupport ? true, nasm # Assembly optimizations
 , cpmlSupport ? true # Compaq's fast math library
-#, efenceSupport ? false, libefence ? null # Use ElectricFence for malloc debugging
-, sndfileFileIOSupport ? false, libsndfile ? null # Use libsndfile, instead of lame's internal routines
+#, efenceSupport ? false, libefence # Use ElectricFence for malloc debugging
+, sndfileFileIOSupport ? false, libsndfile # Use libsndfile, instead of lame's internal routines
 , analyzerHooksSupport ? true # Use analyzer hooks
 , decoderSupport ? true # mpg123 decoder
 , frontendSupport ? true # Build the lame executable
-#, mp3xSupport ? false, gtk1 ? null # Build GTK frame analyzer
+#, mp3xSupport ? false, gtk1 # Build GTK frame analyzer
 , mp3rtpSupport ? false # Build mp3rtp
 , debugSupport ? false # Debugging (disables optimizations)
 }:
 
-assert nasmSupport -> (nasm != null);
-#assert efenceSupport -> (libefence != null);
-assert sndfileFileIOSupport -> (libsndfile != null);
-#assert mp3xSupport -> (analyzerHooksSupport && (gtk1 != null));
-
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
 with lib;
 stdenv.mkDerivation rec {
   pname = "lame";
@@ -42,16 +33,16 @@ stdenv.mkDerivation rec {
     ++ optional sndfileFileIOSupport libsndfile;
 
   configureFlags = [
-    (mkFlag nasmSupport "nasm")
-    (mkFlag cpmlSupport "cpml")
-    #(mkFlag efenceSupport "efence")
+    (enableFeature nasmSupport "nasm")
+    (enableFeature cpmlSupport "cpml")
+    #(enableFeature 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")
+    (enableFeature analyzerHooksSupport "analyzer-hooks")
+    (enableFeature decoderSupport "decoder")
+    (enableFeature frontendSupport "frontend")
+    (enableFeature frontendSupport "dynamic-frontends")
+    #(enableFeature mp3xSupport "mp3x")
+    (enableFeature mp3rtpSupport "mp3rtp")
     (if debugSupport then "--enable-debug=alot" else "")
   ];
 
@@ -65,7 +56,7 @@ stdenv.mkDerivation rec {
     description = "A high quality MPEG Audio Layer III (MP3) encoder";
     homepage    = "http://lame.sourceforge.net";
     license     = licenses.lgpl2;
-    maintainers = with maintainers; [ codyopel fpletz ];
+    maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;
   };
 }