Merge pull request #93715 from lovesegfault/roon-server-revamp

roon-server: revamp
This commit is contained in:
Léo Gaspard 2020-07-24 20:11:01 +02:00 committed by GitHub
commit 0c075ce453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 52 deletions

View File

@ -45,14 +45,14 @@ in {
environment.ROON_DATAROOT = "/var/lib/${name}"; environment.ROON_DATAROOT = "/var/lib/${name}";
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.roon-server}/opt/start.sh"; ExecStart = "${pkgs.roon-server}/start.sh";
LimitNOFILE = 8192; LimitNOFILE = 8192;
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
StateDirectory = name; StateDirectory = name;
}; };
}; };
networking.firewall = mkIf cfg.openFirewall { networking.firewall = mkIf cfg.openFirewall {
allowedTCPPortRanges = [ allowedTCPPortRanges = [
{ from = 9100; to = 9200; } { from = 9100; to = 9200; }
@ -60,7 +60,7 @@ in {
allowedUDPPorts = [ 9003 ]; allowedUDPPorts = [ 9003 ];
}; };
users.groups.${cfg.group} = {}; users.groups.${cfg.group} = {};
users.users.${cfg.user} = users.users.${cfg.user} =
if cfg.user == "roon-server" then { if cfg.user == "roon-server" then {

View File

@ -1,65 +1,68 @@
{ alsaLib, alsaUtils, cifs-utils, fetchurl, ffmpeg_3, libav, mono, stdenv }: { alsaLib
, alsaUtils
with stdenv.lib; , autoPatchelfHook
stdenv.mkDerivation rec { , cifs-utils
, fetchurl
, ffmpeg
, freetype
, lib
, makeWrapper
, stdenv
, zlib
}: stdenv.mkDerivation rec {
name = "roon-server"; name = "roon-server";
version = "100600401"; version = "100700571";
src = fetchurl { src = fetchurl {
url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2"; url = "http://download.roonlabs.com/updates/stable/RoonServer_linuxx64_${version}.tar.bz2";
sha256 = "121mmdh35q4bpgsqhcps6a6q1f4ld9v4hq9gp181bf2n779pk8sh"; sha256 = "191vlzf10ypkk1prp6x2rszlmsihdwpd3wvgf2jg6ckwyxy2hc6k";
}; };
buildInputs = [
alsaLib
alsaUtils
cifs-utils
ffmpeg
freetype
zlib
];
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out
# Check script mv * $out
sed -i '3i PATH=$PATH:${makeBinPath [ cifs-utils ffmpeg_3 libav ]}' check.sh
sed -i '/check_ulimit$/d' check.sh
# Start script
sed -i '3i PATH=$PATH:${makeBinPath [ alsaUtils cifs-utils ffmpeg_3 libav ]}' start.sh
# Debug logging
sed -i '/--debug--gc=sgen --server/exec "$HARDLINK" --debug --gc=sgen --server "$SCRIPT.exe" "$@" -storagetrace -watchertrace' Appliance/RoonAppliance
# Binaries
sed -i '/# boost ulimit/,+2 d' Appliance/RAATServer
sed -i '/# boost ulimit/,+2 d' Appliance/RoonAppliance
sed -i '/# boost ulimit/,+2 d' Server/RoonServer
sed -i '/ln -sf/ d' Appliance/RAATServer
sed -i '/ln -sf/ d' Appliance/RoonAppliance
sed -i '/ln -sf/ d' Server/RoonServer
mkdir -p $out/opt
mv * $out/opt
ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonServer
ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RoonAppliance
ln -sf $out/opt/RoonMono/bin/mono-sgen $out/opt/RoonMono/bin/RAATServer
runHook postInstall runHook postInstall
''; '';
preFixup = '' postFixup =
patchelf \ let
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ linkFix = bin: ''
--set-rpath "${alsaLib}/lib" \ sed -i '/ulimit/d' ${bin}
$out/opt/RoonMono/bin/mono-sgen sed -i '/ln -sf/d' ${bin}
ln -sf $out/RoonMono/bin/mono-sgen $out/RoonMono/bin/${builtins.baseNameOf bin}
'';
wrapFix = bin: ''
wrapProgram ${bin} --prefix PATH : ${lib.makeBinPath [ alsaUtils cifs-utils ffmpeg ]}
'';
in
''
${linkFix "$out/Appliance/RAATServer"}
${linkFix "$out/Appliance/RoonAppliance"}
${linkFix "$out/Server/RoonServer"}
# Checkers sed -i '/which avconv/c\ WHICH_AVCONV=1' $out/check.sh
patchelf \ sed -i '/^check_ulimit/d' $out/check.sh
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ ${wrapFix "$out/check.sh"}
--set-rpath "${alsaLib}/lib" \ ${wrapFix "$out/start.sh"}
$out/opt/Appliance/check_alsa '';
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
$out/opt/Appliance/check_bincompat
'';
meta = { meta = with lib; {
description = "The music player for music lovers."; description = "The music player for music lovers.";
homepage = "https://roonlabs.com"; homepage = "https://roonlabs.com";
license = licenses.unfree; license = licenses.unfree;
maintainers = with maintainers; [ steell ]; maintainers = with maintainers; [ lovesegfault steell ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }