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.
This commit is contained in:
parent
6fe3911c30
commit
7893853026
@ -4,11 +4,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "ums";
|
pname = "ums";
|
||||||
version = "6.2.2";
|
version = "9.1.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + "-Java8.tgz";
|
url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz";
|
||||||
sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15";
|
sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s";
|
||||||
name = "${pname}-${version}.tgz";
|
name = "${pname}-${version}.tgz";
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
|
|||||||
mkdir $out/bin
|
mkdir $out/bin
|
||||||
mv $out/documentation /$out/doc
|
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" \
|
makeWrapper "$out/UMS.sh" "$out/bin/ums" \
|
||||||
--prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \
|
--prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \
|
||||||
--set JAVA_HOME "${jre8}"
|
--set JAVA_HOME "${jre8}"
|
||||||
|
Loading…
Reference in New Issue
Block a user