From 3b32efff7ed3c19ea636e627d1b24df4d2340603 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 4 Oct 2018 02:26:00 +0200
Subject: [PATCH 1/2] WIP liquidsoap update

---
 pkgs/tools/audio/liquidsoap/full.nix | 40 +++++++++++++++++++++++-----
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index eb544fc693e4..7d3b899048f7 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -4,10 +4,12 @@
 , libsamplerate, libmad, taglib, lame, libogg
 , libvorbis, speex, libtheora, libopus, fdk_aac
 , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
-, }:
+, autoconf, automake, libtool
+}:
 
 let
-  version = "1.1.1";
+  pname = "liquidsoap";
+  version = "1.3.4";
 
   packageFilters = map (p: "-e '/ocaml-${p}/d'" )
     [ "gstreamer" "shine" "aacplus" "schroedinger"
@@ -15,16 +17,39 @@ 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" ];
 
+  # 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
@@ -33,8 +58,11 @@ stdenv.mkDerivation {
       faad2 flac ladspaH ffmpeg frei0r dssi
       ocamlPackages.xmlm ocamlPackages.ocaml_pcre
       ocamlPackages.camomile
+      # autoconf automake libtool
     ];
 
+  hardeningDisable = [ "format" "fortify" ];
+
   meta = with stdenv.lib; {
     description = "Swiss-army knife for multimedia streaming";
     homepage = http://liquidsoap.fm/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 827e430a7282..fcf20c6e0cab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3582,7 +3582,7 @@ with pkgs;
 
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
     ffmpeg = ffmpeg_2;
-    ocamlPackages = ocaml-ng.ocamlPackages_4_02;
+    # ocamlPackages = ocaml-ng.ocamlPackages_4_03;
   };
 
   lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };

From d2ce22caf05a24fdac43a2cb172fa331bf3d268d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?TG=20=E2=8A=97=20=CE=98?= <*@tg-x.net>
Date: Mon, 8 Oct 2018 11:30:27 +0200
Subject: [PATCH 2/2] liquidsoap: 1.1.1 -> 1.3.4

---
 pkgs/tools/audio/liquidsoap/full.nix | 18 ------------------
 pkgs/top-level/all-packages.nix      |  3 +--
 2 files changed, 1 insertion(+), 20 deletions(-)

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