mediathekview: 13.8.0 -> 13.9.1 (#194125)

authored by André-Patrick Bubel and committed by GitHub 17b9d619 1d4a52da

+16 -11
+15 -10
pkgs/applications/video/mediathekview/default.nix
··· 1 - { lib, stdenv, fetchurl, makeWrapper, jre, zip }: 1 + { lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "13.8.0"; 4 + version = "13.9.1"; 5 5 pname = "mediathekview"; 6 6 src = fetchurl { 7 7 url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; 8 - sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; 8 + sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM="; 9 9 }; 10 + 10 11 11 12 nativeBuildInputs = [ makeWrapper zip ]; 12 13 13 - installPhase = '' 14 + installPhase = 15 + let 16 + libraryPath = lib.strings.makeLibraryPath [ libglvnd libnotify ]; 17 + in 18 + '' 14 19 runHook preInstall 15 20 16 21 mkdir -p $out/{bin,lib} 17 22 18 - # log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html 19 - zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class 20 - 21 23 install -m644 MediathekView.jar $out/lib 22 24 23 25 makeWrapper ${jre}/bin/java $out/bin/mediathek \ 24 - --add-flags "-jar $out/lib/MediathekView.jar" 26 + --add-flags "-jar $out/lib/MediathekView.jar" \ 27 + --suffix LD_LIBRARY_PATH : "${libraryPath}" 25 28 26 29 makeWrapper ${jre}/bin/java $out/bin/MediathekView \ 27 - --add-flags "-jar $out/lib/MediathekView.jar" 30 + --add-flags "-jar $out/lib/MediathekView.jar" \ 31 + --suffix LD_LIBRARY_PATH : "${libraryPath}" 28 32 29 33 makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ 30 - --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" 34 + --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ 35 + --suffix LD_LIBRARY_PATH : "${libraryPath}" 31 36 32 37 runHook postInstall 33 38 '';
+1 -1
pkgs/top-level/all-packages.nix
··· 29800 29800 29801 29801 mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; 29802 29802 29803 - mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; }; 29803 + mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-17; }; 29804 29804 29805 29805 megapixels = callPackage ../applications/graphics/megapixels { }; 29806 29806