diff options
| author | snicket2100 <57048005+snicket2100@users.noreply.github.com> | 2020-01-18 00:31:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-03-13 04:03:35 +0000 |
| commit | 78938530263f00d03ac4562fc46df752e2b5e587 (patch) | |
| tree | c20249f916b22a6d8ae5bca1d39ff898ed72ad2d /pkgs/servers/ums | |
| parent | 6fe3911c30c4b4dda2a9d2eee3ee1459c5d230d5 (diff) | |
ums: 6.2.2 -> 9.1.0
Removing the packaged JRE so that `jre8` gets used.
Patchelf fails on `tsMuxeR` and `tsMuxeR-new`, but this doesn't make
it any worse comparing to 6.2.2 where is also failed, so I am assuming
fixing it is out of scope of this pr. The only difference is that the
new UMS version correctly identifies that `tsMuxeR` doesn't work,
comparing to the previous one.
Diffstat (limited to 'pkgs/servers/ums')
| -rw-r--r-- | pkgs/servers/ums/default.nix | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 3fb2817277aa..503ff16caeeb 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "6.2.2"; + version = "9.1.0"; src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz"; - sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15"; + url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz"; + sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s"; name = "${pname}-${version}.tgz"; }; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { mkdir $out/bin mv $out/documentation /$out/doc + # 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 + makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ --set JAVA_HOME "${jre8}" |