Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4414a3bc7cbe
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3945c1d87353
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Nov 20, 2019

  1. mediathekview: 13.2.1 -> 13.5.0

    @Moredread @Lassulus
    Moredread authored and Lassulus committed Nov 20, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    3945c1d View commit details
Showing with 14 additions and 12 deletions.
  1. +13 −9 pkgs/applications/video/mediathekview/default.nix
  2. +1 −3 pkgs/top-level/all-packages.nix
22 changes: 13 additions & 9 deletions pkgs/applications/video/mediathekview/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
{ stdenv, fetchurl, makeWrapper, jre }:

stdenv.mkDerivation rec {
version = "13.2.1";
version = "13.5.0";
pname = "mediathekview";
src = fetchurl {
url = "https://download.mediathekview.de/stabil/MediathekView-${version}.tar.gz";
sha256 = "11wg6klviig0h7pprfaygamsgqr7drqra2s4yxgfak6665033l2a";
url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz";
sha256 = "0n05w2d6sh03rjms7m9b5nj84cl16gkrc9nsn53kvldglmqmmrac";
};

nativeBuildInputs = [ makeWrapper ];

installPhase = ''
mkdir -p $out/{lib,bin,share/mediathekview}
mkdir -p $out/{bin,lib}
install -m644 MediathekView.jar $out/
install -m644 -t $out/lib lib/*
install -m755 bin/flv.sh $out/share/mediathekview
install -m644 MediathekView.jar $out/lib
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; {
description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -19889,9 +19889,7 @@ in

mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { };

# mediathekview needs JavaFX, which currently only is available inside OracleJRE
# 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; };
mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; };

meteo = callPackage ../applications/networking/weather/meteo { };