dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mediathekview: 13.7.1 -> 13.8.0

Browse Source 
Hangs on startup when using openjdk16. We use
adoptopenjdk-hotspot-bin-16 instead.
This commit is contained in:
André-Patrick Bubel 2021-08-29 09:19:43 +02:00
parent 9a5c4b119d
commit 0ad5158d6b
No known key found for this signature in database
GPG Key ID: 28925CBA8869FF29
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,34 +1,38 @@
{ lib, stdenv, fetchurl, makeWrapper, jre }: { lib, stdenv, fetchurl, makeWrapper, jre }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "13.7.1"; version = "13.8.0";
pname = "mediathekview"; pname = "mediathekview";
src = fetchurl { src = fetchurl {
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
sha256 = "sha256-yFPyj1Mbgj2eJv4DpvfOtPyTbL9gMAXC5TzSx8AV27o="; sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/{bin,lib} mkdir -p $out/{bin,lib}
install -m644 MediathekView.jar $out/lib install -m644 MediathekView.jar $out/lib
makeWrapper ${jre}/bin/java $out/bin/mediathek \ makeWrapper ${jre}/bin/java $out/bin/mediathek \
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" --add-flags "-jar $out/lib/MediathekView.jar"
makeWrapper ${jre}/bin/java $out/bin/MediathekView \ makeWrapper ${jre}/bin/java $out/bin/MediathekView \
--add-flags "-Xmx1G --enable-preview -jar $out/lib/MediathekView.jar" --add-flags "-jar $out/lib/MediathekView.jar"
makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \
--add-flags "-Xmx1G --enable-preview -Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar"
runHook postInstall
''; '';
meta = with lib; { meta = with 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.)";
homepage = "https://mediathekview.de/"; homepage = "https://mediathekview.de/";
license = licenses.gpl3; license = licenses.gpl3Plus;
maintainers = with maintainers; [ moredread ]; maintainers = with maintainers; [ moredread ];
platforms = platforms.all; platforms = platforms.all;
}; };

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

@ -25949,7 +25949,7 @@ with pkgs;
mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };
mediathekview = callPackage ../applications/video/mediathekview { }; mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; };
megapixels = callPackage ../applications/graphics/megapixels { }; megapixels = callPackage ../applications/graphics/megapixels { };