From 798cc46a6c94d3ad525dab0333378e60dd587d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Thu, 18 Aug 2022 22:45:33 +0200 Subject: [PATCH] vdrPlugins.markad: unstable -> 2.0.4 --- pkgs/applications/video/vdr/plugins.nix | 26 ++++++++++++------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index eaf27ec78862..4e9818456e17 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -49,18 +49,19 @@ in { markad = stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "unstable-2017-03-13"; + version = "2.0.4"; - src = fetchgit { - url = "git://projects.vdr-developer.org/vdr-plugin-markad.git"; - sha256 = "0jvy70r8bcmbs7zdqilfz019z5xkz5c6rs57h1dsgv8v6x86c2i4"; - rev = "ea2e182ec798375f3830f8b794e7408576f139ad"; + src = fetchFromGitHub { + repo = "vdr-plugin-markad"; + owner = "jbrundiers"; + sha256 = "sha256-Y4KsEtUq+KoUooXiw9O9RokBxNwWBkiGB31GncmHkYM="; + rev = "288e3dae93421b0176f4f62b68ea4b39d98e8793"; }; buildInputs = [ vdr libav ]; postPatch = '' - substituteInPlace command/Makefile --replace '$(DESTDIR)/usr' '$(DESTDIR)' + substituteInPlace command/Makefile --replace '/usr' "" substituteInPlace plugin/markad.cpp \ --replace "/usr/bin" "$out/bin" \ @@ -70,22 +71,19 @@ in { --replace "/var/lib/markad" "$out/var/lib/markad" ''; - preBuild = '' - mkdir -p $out/lib/vdr - ''; - buildFlags = [ "DESTDIR=$(out)" - "LIBDIR=$(out)/lib/vdr" + "LIBDIR=/lib/vdr" + "APIVERSION=${vdr.version}" "VDRDIR=${vdr.dev}/include/vdr" - "LOCALEDIR=$(DESTDIR)/share/locale" + "LOCDIR=/share/locale" ]; installFlags = buildFlags; meta = with lib; { - homepage = "https://projects.vdr-developer.org/projects/plg-markad"; - description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung."; + homepage = "https://github.com/jbrundiers/vdr-plugin-markad"; + description = "MarkAd marks advertisements in VDR recordings."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ];