diff options
author | André-Patrick Bubel <code@apb.name> | 2022-10-09 12:40:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-09 12:40:07 +0200 |
commit | 17b9d61957bcd2bfb26d86f65121b63d955afaaf (patch) | |
tree | 719607110b062fdc87cf71a186f1029136c9cc26 /pkgs | |
parent | 1d4a52da6a5009f64b0d0f5c1814074efbf00a5b (diff) |
mediathekview: 13.8.0 -> 13.9.1 (#194125)
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/video/mediathekview/default.nix | 25 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 5ad81bc0a7680..6187584940114 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,33 +1,38 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre, zip }: +{ lib, stdenv, fetchurl, makeWrapper, libglvnd, libnotify, jre, zip }: stdenv.mkDerivation rec { - version = "13.8.0"; + version = "13.9.1"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0zfkwz5psv7m0881ykgqrxwjhadg39c55aj2wpy7m1jdara86c5q"; + sha256 = "4BYKkYhl1YjiAZyfNRdV5KQL+dVkL058uhTG892mXUM="; }; + nativeBuildInputs = [ makeWrapper zip ]; - installPhase = '' + installPhase = + let + libraryPath = lib.strings.makeLibraryPath [ libglvnd libnotify ]; + in + '' runHook preInstall mkdir -p $out/{bin,lib} - # log4j mitigation, see https://logging.apache.org/log4j/2.x/security.html - zip -d MediathekView.jar org/apache/logging/log4j/core/lookup/JndiLookup.class - install -m644 MediathekView.jar $out/lib makeWrapper ${jre}/bin/java $out/bin/mediathek \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView \ - --add-flags "-jar $out/lib/MediathekView.jar" + --add-flags "-jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" makeWrapper ${jre}/bin/java $out/bin/MediathekView_ipv4 \ - --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" + --add-flags "-Djava.net.preferIPv4Stack=true -jar $out/lib/MediathekView.jar" \ + --suffix LD_LIBRARY_PATH : "${libraryPath}" runHook postInstall ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17e762f0d431c..ac6cd9f983248 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29800,7 +29800,7 @@ with pkgs; mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = adoptopenjdk-hotspot-bin-16; }; + mediathekview = callPackage ../applications/video/mediathekview { jre = temurin-bin-17; }; megapixels = callPackage ../applications/graphics/megapixels { }; |