public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/video/vdr/plugins.nix
+19 -2
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";