ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-16 18:37:04 +03:00
Code Issues Projects Releases Wiki Activity

vdr: fix overrideAttrs (#59083)

Browse Source 
The current vdr derivation can not be overritten. The attribute plugins
gets lost while overriding and that leads to problems when evaluating
vdrPlugins.

Moved vdr own plugins outside vdr derivation.
This commit is contained in:
Christian Kögler 2019-04-07 15:09:38 +02:00 committed by zimbatm
parent af44cf8bc5
commit 75060fab76
3 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/applications/video/vdr/default.nix
View File

@ -1,25 +1,11 @@
{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
, gettext, ncurses, systemd, perl
, gettext, systemd, perl, lib
, enableSystemd ? true
, enableBidi ? true
}:
let
version = "2.4.0";
}: stdenv.mkDerivation rec {
name = "vdr-${version}";
mkPlugin = name: stdenv.mkDerivation {
name = "vdr-${name}-${version}";
inherit (vdr) src;
buildInputs = [ vdr ];
preConfigure = "cd PLUGINS/src/${name}";
installFlags = [ "DESTDIR=$(out)" ];
};
vdr = stdenv.mkDerivation {
inherit name;
version = "2.4.0";
src = fetchurl {
url = "ftp://ftp.tvdr.de/vdr/${name}.tar.bz2";
@ -31,12 +17,12 @@ let
postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
buildInputs = [ fontconfig libjpeg libcap freetype ]
++ stdenv.lib.optional enableSystemd systemd
++ stdenv.lib.optional enableBidi fribidi;
++ lib.optional enableSystemd systemd
++ lib.optional enableBidi fribidi;
buildFlags = [ "vdr" "i18n" ]
++ stdenv.lib.optional enableSystemd "SDNOTIFY=1"
++ stdenv.lib.optional enableBidi "BIDI=1";
++ lib.optional enableSystemd "SDNOTIFY=1"
++ lib.optional enableBidi "BIDI=1";
nativeBuildInputs = [ perl ];
@ -59,20 +45,11 @@ let
outputs = [ "out" "dev" "man" ];
meta = with stdenv.lib; {
meta = with lib; {
homepage = http://www.tvdr.de/;
description = "Video Disc Recorder";
maintainers = [ maintainers.ck3d ];
platforms = [ "i686-linux" "x86_64-linux" ];
license = licenses.gpl2;
};
};
in vdr // {
plugins = {
skincurses = (mkPlugin "skincurses").overrideAttrs(
oldAttr: { buildInputs = oldAttr.buildInputs ++ [ ncurses ]; });
} // (stdenv.lib.genAttrs [
"epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo"
] mkPlugin);
}

21
pkgs/applications/video/vdr/plugins.nix
View File

@ -1,7 +1,24 @@
{ stdenv, fetchurl, fetchgit, vdr, ffmpeg_2, alsaLib, fetchFromGitHub
, libvdpau, libxcb, xcbutilwm, graphicsmagick, libav, pcre, xorgserver, ffmpeg
, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg }:
{
, libiconv, boost, libgcrypt, perl, utillinux, groff, libva, xorg, ncurses }:
let
mkPlugin = name: stdenv.mkDerivation {
name = "vdr-${vdr.version}-${name}";
inherit (vdr) src;
buildInputs = [ vdr ];
preConfigure = "cd PLUGINS/src/${name}";
installFlags = [ "DESTDIR=$(out)" ];
};
in {
skincurses = (mkPlugin "skincurses").overrideAttrs(oldAttr: {
buildInputs = oldAttr.buildInputs ++ [ ncurses ];
});
inherit (stdenv.lib.genAttrs [
"epgtableid0" "hello" "osddemo" "pictures" "servicedemo" "status" "svdrpdemo"
] mkPlugin);
femon = stdenv.mkDerivation rec {
name = "vdr-femon-2.4.0";

2
pkgs/top-level/all-packages.nix
View File

@ -23547,7 +23547,7 @@ in
ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
vdr = callPackage ../applications/video/vdr { };
vdrPlugins = vdr.plugins // (recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { }));
vdrPlugins = recurseIntoAttrs (callPackages ../applications/video/vdr/plugins.nix { });
wrapVdr = callPackage ../applications/video/vdr/wrapper.nix {};
chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {};