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

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

Browse Source 
liquidsoap: 1.1.1 -> 1.3.4
This commit is contained in:
xeji 2018-10-10 22:54:41 +02:00 committed by GitHub
commit 61e7e256c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,11 @@
, libsamplerate, libmad, taglib, lame, libogg , libsamplerate, libmad, taglib, lame, libogg
, libvorbis, speex, libtheora, libopus, fdk_aac , libvorbis, speex, libtheora, libopus, fdk_aac
, faad2, flac, ladspaH, ffmpeg, frei0r, dssi , faad2, flac, ladspaH, ffmpeg, frei0r, dssi
, }: }:
let let
version = "1.1.1"; pname = "liquidsoap";
version = "1.3.4";
packageFilters = map (p: "-e '/ocaml-${p}/d'" ) packageFilters = map (p: "-e '/ocaml-${p}/d'" )
[ "gstreamer" "shine" "aacplus" "schroedinger" [ "gstreamer" "shine" "aacplus" "schroedinger"
@ -15,14 +16,21 @@ let
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "liquidsoap-full-${version}"; name = "${pname}-full-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz"; url = "https://github.com/savonet/${pname}/releases/download/${version}/${pname}-${version}-full.tar.bz2";
sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa"; 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" ]; configureFlags = [ "--localstatedir=/var" ];
buildInputs = buildInputs =
@ -35,6 +43,8 @@ stdenv.mkDerivation {
ocamlPackages.camomile ocamlPackages.camomile
]; ];
hardeningDisable = [ "format" "fortify" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Swiss-army knife for multimedia streaming"; description = "Swiss-army knife for multimedia streaming";
homepage = http://liquidsoap.fm/; homepage = http://liquidsoap.fm/;

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

@ -3591,8 +3591,7 @@ with pkgs;
lesspipe = callPackage ../tools/misc/lesspipe { }; lesspipe = callPackage ../tools/misc/lesspipe { };
liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
ffmpeg = ffmpeg_2; ffmpeg = ffmpeg-full;
ocamlPackages = ocaml-ng.ocamlPackages_4_02;
}; };
lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { }; lksctp-tools = callPackage ../os-specific/linux/lksctp-tools { };