Merge pull request #48038 from tg-x/liquidsoap-1.3.4

liquidsoap: 1.1.1 -> 1.3.4

pkgs/tools/audio/liquidsoap/full.nix

@@ -4,10 +4,11 @@
 , libsamplerate, libmad, taglib, lame, libogg
 , libvorbis, speex, libtheora, libopus, fdk_aac
 , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
-, }:
+}:
 
 let
-  version = "1.1.1";
+  pname = "liquidsoap";
+  version = "1.3.4";
 
   packageFilters = map (p: "-e '/ocaml-${p}/d'" )
     [ "gstreamer" "shine" "aacplus" "schroedinger"
@@ -15,14 +16,21 @@ let
     ];
 in
 stdenv.mkDerivation {
-  name = "liquidsoap-full-${version}";
+  name = "${pname}-full-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz";
-    sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa";
+    url = "https://github.com/savonet/${pname}/releases/download/${version}/${pname}-${version}-full.tar.bz2";
+    sha256 = "11l1h42sljfxcdhddc8klya4bk99j7a1pndwnzvscb04pvmfmlk0";
   };
 
-  preConfigure = "sed ${toString packageFilters} PACKAGES.default > PACKAGES";
+  preConfigure = /* we prefer system-wide libs */ ''
+    sed -i "s|gsed|sed|" Makefile
+    make bootstrap
+    # autoreconf -vi # use system libraries
+
+    sed ${toString packageFilters} PACKAGES.default > PACKAGES
+  '';
+
   configureFlags = [ "--localstatedir=/var" ];
 
   buildInputs =
@@ -35,6 +43,8 @@ stdenv.mkDerivation {
       ocamlPackages.camomile
     ];
 
+  hardeningDisable = [ "format" "fortify" ];
+
   meta = with stdenv.lib; {
     description = "Swiss-army knife for multimedia streaming";
     homepage = http://liquidsoap.fm/;

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 { };