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

liquidsoap: 1.3.4 → 1.4.2

Browse Source
This commit is contained in:
Vincent Laporte 2020-09-06 18:52:52 +02:00 committed by ehmry
parent 83865b83c9
commit bd954783b2
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/tools/audio/liquidsoap/full.nix
View File

@ -2,13 +2,18 @@
, ocamlPackages , ocamlPackages
, libao, portaudio, alsaLib, libpulseaudio, libjack2 , libao, portaudio, alsaLib, libpulseaudio, libjack2
, libsamplerate, libmad, taglib, lame, libogg , libsamplerate, libmad, taglib, lame, libogg
, libvorbis, speex, libtheora, libopus, fdk_aac , libvorbis, speex, libtheora, libopus
, faad2, flac, ladspaH, ffmpeg, frei0r, dssi , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
}: }:
let let
pname = "liquidsoap"; pname = "liquidsoap";
version = "1.3.4"; version = "1.4.2";
ocaml-ffmpeg = fetchurl {
url = "https://github.com/savonet/ocaml-ffmpeg/releases/download/v0.4.2/ocaml-ffmpeg-0.4.2.tar.gz";
sha256 = "1lx5s1avds9fsh77828ifn71r2g89rxakhs8pp995a675phm9viw";
};
packageFilters = map (p: "-e '/ocaml-${p}/d'" ) packageFilters = map (p: "-e '/ocaml-${p}/d'" )
[ "gstreamer" "shine" "aacplus" "schroedinger" [ "gstreamer" "shine" "aacplus" "schroedinger"
@ -19,10 +24,17 @@ stdenv.mkDerivation {
name = "${pname}-full-${version}"; name = "${pname}-full-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/savonet/${pname}/releases/download/${version}/${pname}-${version}-full.tar.bz2"; url = "https://github.com/savonet/${pname}/releases/download/v${version}/${pname}-${version}-full.tar.gz";
sha256 = "11l1h42sljfxcdhddc8klya4bk99j7a1pndwnzvscb04pvmfmlk0"; sha256 = "0wkwnzj1a0vizv7sr1blwk5gzm2qi0n02ndijnq1i50cwrgxs1a4";
}; };
# Use ocaml-srt and ocaml-fdkaac from nixpkgs
# Use ocaml-ffmpeg at 0.4.2 for compatibility with ffmpeg 4.3
prePatch = ''
rm -rf ocaml-srt*/ ocaml-fdkaac*/ ocaml-ffmpeg*/
tar xzf ${ocaml-ffmpeg}
'';
preConfigure = /* we prefer system-wide libs */ '' preConfigure = /* we prefer system-wide libs */ ''
sed -i "s|gsed|sed|" Makefile sed -i "s|gsed|sed|" Makefile
make bootstrap make bootstrap
@ -42,10 +54,12 @@ stdenv.mkDerivation {
[ which ocamlPackages.ocaml ocamlPackages.findlib [ which ocamlPackages.ocaml ocamlPackages.findlib
libao portaudio alsaLib libpulseaudio libjack2 libao portaudio alsaLib libpulseaudio libjack2
libsamplerate libmad taglib lame libogg libsamplerate libmad taglib lame libogg
libvorbis speex libtheora libopus fdk_aac libvorbis speex libtheora libopus
faad2 flac ladspaH ffmpeg frei0r dssi faad2 flac ladspaH ffmpeg frei0r dssi
ocamlPackages.xmlm ocamlPackages.ocaml_pcre ocamlPackages.xmlm ocamlPackages.ocaml_pcre
ocamlPackages.camomile ocamlPackages.camomile
ocamlPackages.fdkaac
ocamlPackages.srt ocamlPackages.sedlex_2 ocamlPackages.menhir
]; ];
hardeningDisable = [ "format" "fortify" ]; hardeningDisable = [ "format" "fortify" ];

1
pkgs/top-level/all-packages.nix
View File

@ -4857,7 +4857,6 @@ in
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg-full; ffmpeg = ffmpeg-full;
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
}; };
lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };