diff options
| author | Christian Kögler <ck3d@gmx.de> | 2019-04-07 15:09:38 +0200 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2019-04-07 15:09:38 +0200 |
| commit | 75060fab7625f07d59434d3fa3b52d5cd419f2fe (patch) | |
| tree | ff23cfd1df4f241dd910d46a3bdbea165f8955b7 /pkgs/applications/video/vdr/plugins.nix | |
| parent | af44cf8bc53901608c51c98c235bc42080627e32 (diff) | |
| download | nixpkgs-75060fab7625f07d59434d3fa3b52d5cd419f2fe.tar nixpkgs-75060fab7625f07d59434d3fa3b52d5cd419f2fe.tar.gz nixpkgs-75060fab7625f07d59434d3fa3b52d5cd419f2fe.tar.bz2 nixpkgs-75060fab7625f07d59434d3fa3b52d5cd419f2fe.tar.lz nixpkgs-75060fab7625f07d59434d3fa3b52d5cd419f2fe.tar.xz nixpkgs-75060fab7625f07d59434d3fa3b52d5cd419f2fe.tar.zst nixpkgs-75060fab7625f07d59434d3fa3b52d5cd419f2fe.zip | |
vdr: fix overrideAttrs (#59083)
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.
Diffstat (limited to 'pkgs/applications/video/vdr/plugins.nix')
| -rw-r--r-- | pkgs/applications/video/vdr/plugins.nix | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 0e543390c4b..4fc3783ba51 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -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"; |