Unverified Commit 3e3c3643 authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

Merge pull request #179611 from prusnak/mkflag-remove 

remove mkFlag usage where lib.enableFeature and/or lib.withFeature can be used
parents a3c5c5ee 3d881da9

pkgs/applications/audio/moc/default.nix

+37 −41
Original line number Diff line number Diff line
@@ -24,11 +24,7 @@ 
, withDebug ? false

}:



let

  opt = lib.optional;

  mkFlag = c: f: if c then "--with-${f}" else "--without-${f}";



in stdenv.mkDerivation rec {

stdenv.mkDerivation rec {



  pname = "moc";

  version = "2.5.2";
@@ -39,56 +35,56 @@ in stdenv.mkDerivation rec { 
  };



  patches = []

    ++ opt ffmpegSupport ./moc-ffmpeg4.patch

    ++ opt pulseSupport ./pulseaudio.patch;

    ++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch

    ++ lib.optional pulseSupport ./pulseaudio.patch;



  nativeBuildInputs = [ pkg-config ]

    ++ opt pulseSupport autoreconfHook;

    ++ lib.optional pulseSupport autoreconfHook;



  buildInputs = [ ncurses db popt libtool ]

    # Sound sub-systems

    ++ opt alsaSupport alsa-lib

    ++ opt pulseSupport libpulseaudio

    ++ opt jackSupport libjack2

    ++ lib.optional alsaSupport alsa-lib

    ++ lib.optional pulseSupport libpulseaudio

    ++ lib.optional jackSupport libjack2

    # Audio formats

    ++ opt (aacSupport || mp3Support) libid3tag

    ++ opt aacSupport faad2

    ++ opt flacSupport flac

    ++ opt midiSupport timidity

    ++ opt modplugSupport libmodplug

    ++ opt mp3Support libmad

    ++ lib.optional (aacSupport || mp3Support) libid3tag

    ++ lib.optional aacSupport faad2

    ++ lib.optional flacSupport flac

    ++ lib.optional midiSupport timidity

    ++ lib.optional modplugSupport libmodplug

    ++ lib.optional mp3Support libmad

    ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]

    ++ opt vorbisSupport libvorbis

    ++ opt speexSupport speex

    ++ opt ffmpegSupport ffmpeg

    ++ opt sndfileSupport libsndfile

    ++ opt wavpackSupport wavpack

    ++ lib.optional vorbisSupport libvorbis

    ++ lib.optional speexSupport speex

    ++ lib.optional ffmpegSupport ffmpeg

    ++ lib.optional sndfileSupport libsndfile

    ++ lib.optional wavpackSupport wavpack

    # Misc

    ++ opt curlSupport curl

    ++ opt samplerateSupport libsamplerate

    ++ lib.optional curlSupport curl

    ++ lib.optional samplerateSupport libsamplerate

    ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ];



  configureFlags = [

    # Sound sub-systems

    (mkFlag alsaSupport "alsa")

    (mkFlag pulseSupport "pulse")

    (mkFlag jackSupport "jack")

    (mkFlag ossSupport "oss")

    (lib.withFeature alsaSupport "alsa")

    (lib.withFeature pulseSupport "pulse")

    (lib.withFeature jackSupport "jack")

    (lib.withFeature ossSupport "oss")

    # Audio formats

    (mkFlag aacSupport "aac")

    (mkFlag flacSupport "flac")

    (mkFlag midiSupport "timidity")

    (mkFlag modplugSupport "modplug")

    (mkFlag mp3Support "mp3")

    (mkFlag musepackSupport "musepack")

    (mkFlag vorbisSupport "vorbis")

    (mkFlag speexSupport "speex")

    (mkFlag ffmpegSupport "ffmpeg")

    (mkFlag sndfileSupport "sndfile")

    (mkFlag wavpackSupport "wavpack")

    (lib.withFeature aacSupport "aac")

    (lib.withFeature flacSupport "flac")

    (lib.withFeature midiSupport "timidity")

    (lib.withFeature modplugSupport "modplug")

    (lib.withFeature mp3Support "mp3")

    (lib.withFeature musepackSupport "musepack")

    (lib.withFeature vorbisSupport "vorbis")

    (lib.withFeature speexSupport "speex")

    (lib.withFeature ffmpegSupport "ffmpeg")

    (lib.withFeature sndfileSupport "sndfile")

    (lib.withFeature wavpackSupport "wavpack")

    # Misc

    (mkFlag curlSupport "curl")

    (mkFlag samplerateSupport "samplerate")

    (lib.withFeature curlSupport "curl")

    (lib.withFeature samplerateSupport "samplerate")

    ("--enable-debug=" + (if withDebug then "yes" else "no"))

    "--disable-cache"

    "--without-rcc"

pkgs/development/libraries/lame/default.nix

+9 −13
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
, debugSupport ? false # Debugging (disables optimizations)

}:



let

  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";

in



with lib;

stdenv.mkDerivation rec {

  pname = "lame";
@@ -37,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 "")

  ];

pkgs/development/libraries/libass/default.nix

+3 −7
Original line number Diff line number Diff line
@@ -8,10 +8,6 @@ 


assert fontconfigSupport -> fontconfig != null;



let

  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";

in



with lib;

stdenv.mkDerivation rec {

  pname = "libass";
@@ -23,9 +19,9 @@ stdenv.mkDerivation rec { 
  };



  configureFlags = [

    (mkFlag fontconfigSupport "fontconfig")

    (mkFlag rasterizerSupport "rasterizer")

    (mkFlag largeTilesSupport "large-tiles")

    (enableFeature fontconfigSupport "fontconfig")

    (enableFeature rasterizerSupport "rasterizer")

    (enableFeature largeTilesSupport "large-tiles")

  ];



  nativeBuildInputs = [ pkg-config yasm ];

pkgs/development/libraries/libinfinity/default.nix

+7 −9
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ assert avahiSupport -> avahi != null; 
assert gtkWidgets -> gtk3 != null;



let

  mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature;



  self = stdenv.mkDerivation rec {

    pname = "libinfinity";

    version = "0.7.2";
@@ -29,13 +27,13 @@ let 
    propagatedBuildInputs = [ gnutls ];



    configureFlags = [

      "--enable-gtk-doc"

      "--enable-introspection"

      (mkFlag gtkWidgets "inftextgtk")

      (mkFlag gtkWidgets "infgtk")

      "--with-infinoted"

      "--with-libdaemon"

      (mkFlag avahiSupport "avahi")

      (lib.enableFeature true "gtk-doc")

      (lib.enableFeature true "introspection")

      (lib.withFeature gtkWidgets "inftextgtk")

      (lib.withFeature gtkWidgets "infgtk")

      (lib.withFeature true "infinoted")

      (lib.withFeature true "libdaemon")

      (lib.withFeature avahiSupport "avahi")

    ];



    passthru = {

pkgs/development/libraries/wiredtiger/default.nix

+13 −20
Original line number Diff line number Diff line
@@ -7,13 +7,6 @@ 


with lib;

let

  mkFlag = trueStr: falseStr: cond: name: val: "--"

    + (if cond then trueStr else falseStr)

    + name

    + optionalString (val != null && cond != false) "=${val}";

  mkEnable = mkFlag "enable-" "disable-";

  mkWith = mkFlag "with-" "without-";



  shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;



  optLz4 = shouldUsePkg lz4;
@@ -39,19 +32,19 @@ stdenv.mkDerivation rec { 
  buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ];



  configureFlags = [

    (mkWith   false                   "attach"     null)

    (mkWith   true                    "builtins"   "")

    (mkEnable (optBzip2 != null)      "bzip2"      null)

    (mkEnable false                   "diagnostic" null)

    (mkEnable false                   "java"       null)

    (mkEnable (optLeveldb != null)    "leveldb"    null)

    (mkEnable false                   "python"     null)

    (mkEnable (optSnappy != null)     "snappy"     null)

    (mkEnable (optLz4 != null)        "lz4"        null)

    (mkEnable (optGperftools != null) "tcmalloc"   null)

    (mkEnable (optZlib != null)       "zlib"       null)

    (mkWith   (optDb != null)         "berkeleydb" optDb)

    (mkWith   false                   "helium"     null)

    (withFeature   false                   "attach")

    (withFeatureAs true                    "builtins" "")

    (enableFeature (optBzip2 != null)      "bzip2")

    (enableFeature false                   "diagnostic")

    (enableFeature false                   "java")

    (enableFeature (optLeveldb != null)    "leveldb")

    (enableFeature false                   "python")

    (enableFeature (optSnappy != null)     "snappy")

    (enableFeature (optLz4 != null)        "lz4")

    (enableFeature (optGperftools != null) "tcmalloc")

    (enableFeature (optZlib != null)       "zlib")

    (withFeatureAs (optDb != null)         "berkeleydb" optDb)

    (withFeature   false                   "helium")

  ];



  preConfigure = ''