Unverified Commit fe7dd8ee authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #212006 from Shawn8901/remove_with_lib_1

parents 369de1c1 3866fa44

pkgs/applications/audio/asunder/default.nix

+8 −10
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 
#, aacSupport ? false, TODO: neroAacEnc

}:



with lib;



stdenv.mkDerivation rec {

  version = "2.9.7";

  pname = "asunder";
@@ -23,20 +21,20 @@ stdenv.mkDerivation rec { 
  buildInputs = [ gtk2 libcddb ];



  runtimeDeps =

    optional mp3Support lame ++

    optional oggSupport vorbis-tools ++

    optional flacSupport flac ++

    optional opusSupport opusTools ++

    optional wavpackSupport wavpack ++

    optional monkeysAudioSupport monkeysAudio ++

    lib.optional mp3Support lame ++

    lib.optional oggSupport vorbis-tools ++

    lib.optional flacSupport flac ++

    lib.optional opusSupport opusTools ++

    lib.optional wavpackSupport wavpack ++

    lib.optional monkeysAudioSupport monkeysAudio ++

    [ cdparanoia ];



  postInstall = ''

    wrapProgram "$out/bin/asunder" \

      --prefix PATH : "${makeBinPath runtimeDeps}"

      --prefix PATH : "${lib.makeBinPath runtimeDeps}"

  '';



  meta = {

  meta = with lib; {

    description = "A graphical Audio CD ripper and encoder for Linux";

    homepage = "http://littlesvr.ca/asunder/index.php";

    license = licenses.gpl2;

pkgs/applications/audio/carla/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
  withGtk2 ? true, gtk2 ? null,

  withGtk3 ? true, gtk3 ? null }:



with lib;



assert withFrontend -> python3Packages ? pyqt5;

assert withQt -> qtbase != null;

assert withQt -> wrapQtAppsHook != null;
@@ -30,13 +28,13 @@ stdenv.mkDerivation rec { 


  pythonPath = with python3Packages; [

    rdflib pyliblo

  ] ++ optional withFrontend pyqt5;

  ] ++ lib.optional withFrontend pyqt5;



  buildInputs = [

    file liblo alsa-lib fluidsynth jack2 libpulseaudio libsndfile

  ] ++ optional withQt qtbase

    ++ optional withGtk2 gtk2

    ++ optional withGtk3 gtk3;

  ] ++ lib.optional withQt qtbase

    ++ lib.optional withGtk2 gtk2

    ++ lib.optional withGtk3 gtk3;



  propagatedBuildInputs = pythonPath;

pkgs/applications/audio/cmus/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ 
#, vtxSupport ? true, libayemu ? null

}:



with lib;



assert samplerateSupport -> jackSupport;



# vorbis and tremor are mutually exclusive
@@ -113,16 +111,16 @@ stdenv.mkDerivation rec { 


  patches = [ ./option-debugging.patch ];



  configurePhase = "./configure " + concatStringsSep " " ([

  configurePhase = "./configure " + lib.concatStringsSep " " ([

    "prefix=$out"

    "CONFIG_WAV=y"

  ] ++ concatMap (a: a.flags) opts);

  ] ++ lib.concatMap (a: a.flags) opts);



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ ncurses ]

    ++ lib.optional stdenv.cc.isClang clangGCC

    ++ lib.optionals stdenv.isDarwin [ libiconv CoreAudio AudioUnit VideoToolbox ]

    ++ flatten (concatMap (a: a.deps) opts);

    ++ lib.flatten (lib.concatMap (a: a.deps) opts);



  makeFlags = [ "LD=$(CC)" ];

pkgs/applications/audio/crip/default.nix

+3 −5
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
, which

}:



with lib;



stdenv.mkDerivation rec {

  pname = "crip";

  version = "3.9";
@@ -29,7 +27,7 @@ stdenv.mkDerivation rec { 
  buildInputs = [ perlPackages.perl perlPackages.CDDB_get ];

  nativeBuildInputs = [ makeWrapper ];



  toolDeps = makeBinPath [

  toolDeps = lib.makeBinPath [

    cdparanoia

    coreutils

    eject
@@ -46,7 +44,7 @@ stdenv.mkDerivation rec { 
  installPhase = ''

    mkdir -p $out/bin/



    for script in ${escapeShellArgs scripts}; do

    for script in ${lib.escapeShellArgs scripts}; do

      cp $script $out/bin/



      substituteInPlace $out/bin/$script \
@@ -63,6 +61,6 @@ stdenv.mkDerivation rec { 
    description = "Terminal-based ripper/encoder/tagger tool for creating Ogg Vorbis/FLAC files";

    license = lib.licenses.gpl1Only;

    platforms = lib.platforms.linux;

    maintainers = [ maintainers.endgame ];

    maintainers = [ lib.maintainers.endgame ];

  };

}

pkgs/applications/audio/fmit/default.nix

+7 −9
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ assert alsaSupport -> alsa-lib != null; 
assert jackSupport -> libjack2 != null;

assert portaudioSupport -> portaudio != null;



with lib;



mkDerivation rec {

  pname = "fmit";

  version = "1.2.14";
@@ -22,9 +20,9 @@ mkDerivation rec { 


  nativeBuildInputs = [ qmake itstool wrapQtAppsHook ];

  buildInputs = [ fftw qtbase qtmultimedia ]

    ++ optionals alsaSupport [ alsa-lib ]

    ++ optionals jackSupport [ libjack2 ]

    ++ optionals portaudioSupport [ portaudio ];

    ++ lib.optionals alsaSupport [ alsa-lib ]

    ++ lib.optionals jackSupport [ libjack2 ]

    ++ lib.optionals portaudioSupport [ portaudio ];



  postPatch = ''

    substituteInPlace fmit.pro --replace '$$FMITVERSIONGITPRO' '${version}'
@@ -32,13 +30,13 @@ mkDerivation rec { 


  preConfigure = ''

    qmakeFlags="$qmakeFlags \

      CONFIG+=${optionalString alsaSupport "acs_alsa"} \

      CONFIG+=${optionalString jackSupport "acs_jack"} \

      CONFIG+=${optionalString portaudioSupport "acs_portaudio"} \

      CONFIG+=${lib.optionalString alsaSupport "acs_alsa"} \

      CONFIG+=${lib.optionalString jackSupport "acs_jack"} \

      CONFIG+=${lib.optionalString portaudioSupport "acs_portaudio"} \

      PREFIXSHORTCUT=$out"

  '';



  meta = {

  meta = with lib; {

    description = "Free Musical Instrument Tuner";

    longDescription = ''

      FMIT is a graphical utility for tuning musical instruments, with error