From e5c8250c3e2f032de32a6fb9a747ac8cfd2524ce Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Thu, 7 May 2020 00:17:17 +0200 Subject: [PATCH] ums: 9.1.0 -> 9.4.2 --- pkgs/servers/ums/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 503ff16caeeb..3cfa79ca4d3a 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -4,13 +4,18 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "9.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz"; - sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s"; - name = "${pname}-${version}.tgz"; - }; + version = "9.4.2"; + + src = { + i686-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz"; + sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; + }; + x86_64-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; + sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ makeWrapper ]; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` # script will correctly fall back to the JRE specified by JAVA_HOME - rm -rf $out/linux/jre-x64 $out/linux/jre-x86 + rm -rf $out/jre makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \