public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mediathekview: 13.2.1 -> 13.5.0

Browse Source
This commit is contained in:
André-Patrick Bubel 2019-11-11 22:48:24 +01:00 committed by Lassulus
parent 4414a3bc7c
commit 3945c1d873
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/video/mediathekview/default.nix
View File

@ -1,25 +1,29 @@
{ stdenv, fetchurl, makeWrapper, jre }: { stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "13.2.1"; version = "13.5.0";
pname = "mediathekview"; pname = "mediathekview";
src = fetchurl { src = fetchurl {
url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz"; url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a"; sha256 = "0n05w2d6sh03rjms7m9b5nj84cl16gkrc9nsn53kvldglmqmmrac";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
mkdir -p $out/{lib,bin,share/mediathekview} mkdir -p $out/{bin,lib}
install -m644 MediathekView.jar $out/ install -m644 MediathekView.jar $out/lib
install -m644 -t $out/lib lib/*
install -m755 bin/flv.sh $out/share/mediathekview
makeWrapper ${jre}/bin/java $out/bin/mediathek \ makeWrapper ${jre}/bin/java $out/bin/mediathek \
--add-flags "-cp '$out/lib/*' -jar $out/MediathekView.jar" --add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
'';
makeWrapper ${jre}/bin/java $out/bin/MediathekView \
--add-flags "-Xmx1G -jar $out/lib/MediathekView.jar"
makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \
--add-flags "-Xmx1G -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";

4
pkgs/top-level/all-packages.nix
View File

@ -19889,9 +19889,7 @@ in
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
# mediathekview needs JavaFX, which currently only is available inside OracleJRE mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; };
# we might be able to get rid of it, as soon as we have an OpenJRE with OpenJFX included
mediathekview = callPackage ../applications/video/mediathekview { jre = oraclejre; };
meteo = callPackage ../applications/networking/weather/meteo { }; meteo = callPackage ../applications/networking/weather/meteo { };