diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
| commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
| tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix | |
| parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
| parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
| download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix index 7660b4eae3d2..a01ee1481f8a 100644 --- a/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix +++ b/nixpkgs/pkgs/applications/video/vdr/xineliboutput/default.nix @@ -1,18 +1,34 @@ -{ stdenv, fetchurl, lib, vdr -, libav, libcap, libvdpau -, xine-lib, libjpeg, libextractor, libglvnd, libGLU -, libX11, libXext, libXrender, libXrandr +{ stdenv +, fetchurl +, lib +, vdr +, libcap +, libvdpau +, xine-lib +, libjpeg +, libextractor +, libglvnd +, libGLU +, libX11 +, libXext +, libXrender +, libXrandr +, ffmpeg +, avahi +, wayland , makeWrapper -}: let +, dbus-glib +}: +let makeXinePluginPath = l: lib.concatStringsSep ":" (map (p: "${p}/lib/xine/plugins") l); - self = stdenv.mkDerivation rec { + self = stdenv.mkDerivation rec { pname = "vdr-xineliboutput"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { url = "mirror://sourceforge/project/xineliboutput/xineliboutput/${pname}-${version}/${pname}-${version}.tgz"; - sha256 = "0a24hs5nr7ncf51c5agyfn1xrvb4p70y3i0s6dlyyd9bwbfjldns"; + sha256 = "sha256-GnTaGaIbBufZP2npa9mAbrO1ccMf1RzhbvjrWhKBTjg="; }; postPatch = '' @@ -41,7 +57,8 @@ nativeBuildInputs = [ makeWrapper ]; buildInputs = [ - libav + dbus-glib + ffmpeg libcap libextractor libjpeg @@ -54,6 +71,8 @@ libX11 vdr xine-lib + avahi + wayland ]; passthru.requiredXinePlugins = [ xine-lib self ]; @@ -66,4 +85,5 @@ inherit (vdr.meta) platforms; }; }; -in self +in +self |