diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-10-10 22:54:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-10 22:54:41 +0200 |
| commit | 61e7e256c3e9981de64ddf63faba961df2b26048 (patch) | |
| tree | d5a8a380a2a34923e327d1d9d1e972bb2732dba0 /pkgs/top-level | |
| parent | fd9518a53272a22c07e20b788200badbb9c597f4 (diff) | |
| parent | d2ce22caf05a24fdac43a2cb172fa331bf3d268d (diff) | |
| download | nixlib-61e7e256c3e9981de64ddf63faba961df2b26048.tar nixlib-61e7e256c3e9981de64ddf63faba961df2b26048.tar.gz nixlib-61e7e256c3e9981de64ddf63faba961df2b26048.tar.bz2 nixlib-61e7e256c3e9981de64ddf63faba961df2b26048.tar.lz nixlib-61e7e256c3e9981de64ddf63faba961df2b26048.tar.xz nixlib-61e7e256c3e9981de64ddf63faba961df2b26048.tar.zst nixlib-61e7e256c3e9981de64ddf63faba961df2b26048.zip | |
Merge pull request #48038 from tg-x/liquidsoap-1.3.4
liquidsoap: 1.1.1 -> 1.3.4
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3e54fa8d76d..9978b2969c91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3591,8 +3591,7 @@ with pkgs; lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { - ffmpeg = ffmpeg_2; - ocamlPackages = ocaml-ng.ocamlPackages_4_02; + ffmpeg = ffmpeg-full; }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; |