summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorAndré-Patrick Bubel <code@andre-bubel.de>2019-01-19 13:23:54 +0100
committerAndré-Patrick Bubel <code@andre-bubel.de>2019-01-19 13:26:41 +0100
commitc18c25f0e9090eafb1ac2d935398131952d28974 (patch)
treefd3620db2061ddb99603959b198263d6365cba2e /pkgs
parent88098b14d4d5846a82e80c21510a357d0cf6cf0b (diff)
downloadnixpkgs-c18c25f0e9090eafb1ac2d935398131952d28974.tar
nixpkgs-c18c25f0e9090eafb1ac2d935398131952d28974.tar.gz
nixpkgs-c18c25f0e9090eafb1ac2d935398131952d28974.tar.bz2
nixpkgs-c18c25f0e9090eafb1ac2d935398131952d28974.tar.lz
nixpkgs-c18c25f0e9090eafb1ac2d935398131952d28974.tar.xz
nixpkgs-c18c25f0e9090eafb1ac2d935398131952d28974.tar.zst
nixpkgs-c18c25f0e9090eafb1ac2d935398131952d28974.zip
zdfmediathk: Remove as it is obsolete and broken
The package `mediathekview` is the current alternative.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/video/zdfmediathk/default.nix38
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 1 insertions, 40 deletions
diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix
deleted file mode 100644
index a875daf065e..00000000000
--- a/pkgs/applications/video/zdfmediathk/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, jre }:
-
-with stdenv;
-
-mkDerivation rec {
-
-  version = "10";
-  name = "zdfmediathk-${version}";
-  src = fetchurl {
-    url = "https://github.com/xaverW/MediathekView/archive/Version${version}.tar.gz";
-    sha256 = "12iyigqjslbn8rzym1mq1s0mvss7r97aiy6wfdrq5m0psarlcljw";
-  };
-
-  installPhase = ''
-    mkdir -p $out/{lib,bin,share/{doc,licenses}}
-    cd dist/
-    install -m644 MediathekView.jar $out/
-    install -m644 -t $out/lib lib/*
-    install -m755 bin/flv.sh $out/bin/
-    install -m644 -t $out/share/doc Anleitung/*.pdf
-    install -m644 -t $out/share/licenses Copyright/{*.*,_copyright}
-    bin="$out/bin/mediathek"
-    cat >> "$bin" << EOF
-    #!/bin/sh
-    exec ${jre}/bin/java -cp "$out/lib/*" -Xms128M -Xmx1G -jar "$out/MediathekView.jar" "\$@"
-    EOF
-    chmod +x "$bin"
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)";
-    homepage = https://github.com/xaverW/MediathekView/;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.flosse ];
-    platforms = platforms.all;
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 90136f86aca..609ca55b805 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -340,6 +340,7 @@ mapAliases ({
   xlibs = xorg; # added 2015-09
   xpraGtk3 = xpra; # added 2018-09-13
   youtubeDL = youtube-dl;  # added 2014-10-26
+  zdfmediathk = mediathekview; # added 2019-01-19
 
   # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
   # branch-off
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94e2ae3f5e5..b1da6a5a41d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23079,8 +23079,6 @@ in
 
   zap = callPackage ../tools/networking/zap { };
 
-  zdfmediathk = callPackage ../applications/video/zdfmediathk { };
-
   zopfli = callPackage ../tools/compression/zopfli { };
 
   myEnvFun = callPackage ../misc/my-env {