diff --git a/pkgs/servers/roon-bridge/default.nix b/pkgs/servers/roon-bridge/default.nix index 9b896cd2a116..2607ade99310 100644 --- a/pkgs/servers/roon-bridge/default.nix +++ b/pkgs/servers/roon-bridge/default.nix @@ -11,24 +11,23 @@ }: stdenv.mkDerivation rec { pname = "roon-bridge"; - version = "1.8-880"; + version = "1.8-918"; src = let urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; inherit (stdenv.targetPlatform) system; - noSuchSystem = throw "Unsupposed system: ${system}"; in { x86_64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-YTLy3D1CQR1hlsGw2MmZtxHT82T0PCYZxD4adt2m1+o="; + hash = "sha256-Tx8KmGKh6BNoo2RKJm0HfPHRXiFsz+FtX5gQZ1FCEEg="; }; aarch64-linux = fetchurl { url = "http://download.roonlabs.com/builds/RoonBridge_linuxarmv8_${urlVersion}.tar.bz2"; - sha256 = "sha256-aCQtYMUIzwhmYJW4a8cFzIRuxyMVIkeaJH4w1Lasp3M="; + hash = "sha256-UkdAs+/l9c4j8PNlAZfNNCJogjxZItcDikS+tOjYjA0="; }; - }.${system} or noSuchSystem; + }.${system} or (throw "Unsupposed system: ${system}"); dontConfigure = true; dontBuild = true; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index b92d871852de..8decbf1341b6 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -9,13 +9,14 @@ , krb5 , lib , libtasn1 +, lttng-ust_2_12 , makeWrapper -, stdenv , openssl +, stdenv }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-903"; + version = "1.8-923"; src = let @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - sha256 = "sha256-FkB3sh1uwOctBOAW7eO8HFNr9a9RG3Yq4hKKscYYER4="; + hash = "sha256-txf8W7SoPb20S7KcQDfExPEn5dubu9JVEX89dWngYFU="; }; dontConfigure = true; @@ -34,6 +35,7 @@ stdenv.mkDerivation rec { freetype krb5 libtasn1 + lttng-ust_2_12 stdenv.cc.cc.lib ]; @@ -82,10 +84,6 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper "$out/Server/RoonServer" "$out/bin/RoonServer" --run "cd $out" - # This is unused and depends on an ancient version of lttng-ust, so we - # just patch it out - patchelf --remove-needed liblttng-ust.so.0 $out/RoonDotnet/shared/Microsoft.NETCore.App/5.0.0/libcoreclrtraceptprovider.so - runHook postInstall '';