diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 7d3b899048f7..7ef0793a4831 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -4,7 +4,6 @@ , libsamplerate, libmad, taglib, lame, libogg , libvorbis, speex, libtheora, libopus, fdk_aac , faad2, flac, ladspaH, ffmpeg, frei0r, dssi -, autoconf, automake, libtool }: let @@ -34,22 +33,6 @@ stdenv.mkDerivation { configureFlags = [ "--localstatedir=/var" ]; - # liquidsoap only looks for lame and ffmpeg at runtime, so we need to link them in manually - NIX_LDFLAGS = [ - # # LAME - # # "-lmp3lame" - # # ffmpeg - # "-lavcodec" - # "-lavdevice" - # "-lavfilter" - # "-lavformat" - "-lavresample" - # "-lavutil" - # "-lpostproc" - # "-lswresample" - "-lswscale" - ]; - buildInputs = [ which ocamlPackages.ocaml ocamlPackages.findlib pkgconfig libao portaudio alsaLib libpulseaudio libjack2 @@ -58,7 +41,6 @@ stdenv.mkDerivation { faad2 flac ladspaH ffmpeg frei0r dssi ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.camomile - # autoconf automake libtool ]; hardeningDisable = [ "format" "fortify" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcf20c6e0cab..0309b001797e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3581,8 +3581,7 @@ with pkgs; lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { - ffmpeg = ffmpeg_2; - # ocamlPackages = ocaml-ng.ocamlPackages_4_03; + ffmpeg = ffmpeg-full; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };