cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #78125 from KnairdA/master

Browse source 
pdfpc: Fix gstreamer video playback issue #73321
This commit is contained in:
Jan Tojnar 2020-01-31 01:53:17 +01:00 committed by GitHub
commit 14576373d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/applications/misc/pdfpc/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }:
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "${product}-${version}";
@ -19,8 +19,15 @@ stdenv.mkDerivation rec {
gobject-introspection
wrapGAppsHook
];
buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
libpthreadstubs librsvg pcre ];
buildInputs = [
gtk3 libgee poppler
libpthreadstubs librsvg pcre
gstreamer
gst-plugins-base
(gst-plugins-good.override { gtkSupport = true; })
gst-libav
];
cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF";

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

@ -20828,7 +20828,7 @@ in
pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
pdfpc = callPackage ../applications/misc/pdfpc {
inherit (gst_all_1) gstreamer gst-plugins-base;
inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav;
};
peek = callPackage ../applications/video/peek { };