public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Refactor mkFlag out of old packages"

Browse Source 
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
This commit is contained in:
Eelco Dolstra
2015-06-04 14:54:50 +02:00
parent 17b6a597fb
commit 5d8fe045b6
11 changed files with 202 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/lame/default.nix
+12 -13
View File
@@ -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 = {