Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 90bc79c7cf5d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9c9c6461ba79
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 3, 2021

  1. pdfpc: 4.4.1 -> 4.5.0

    wentasah committed Jan 3, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    bagder Daniel Stenberg
    Copy the full SHA
    9d0164d View commit details
  2. Merge pull request #108307 from wentasah/pdfpc

    pdfpc: 4.4.1 -> 4.5.0
    pSub authored Jan 3, 2021
    Copy the full SHA
    9c9c646 View commit details
Showing with 7 additions and 3 deletions.
  1. +7 −3 pkgs/applications/misc/pdfpc/default.nix
10 changes: 7 additions & 3 deletions pkgs/applications/misc/pdfpc/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook }:
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook
, webkitgtk, discount, json-glib }:

stdenv.mkDerivation rec {
name = "${product}-${version}";
product = "pdfpc";
version = "4.4.1";
version = "4.5.0";

src = fetchFromGitHub {
repo = product;
owner = product;
rev = "v${version}";
sha256 = "11n925c5jj3yfwnqkgxzqrmsrpqh8ls1g4idmqqzpsanpam1xvna";
sha256 = "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck";
};

nativeBuildInputs = [
@@ -27,6 +28,9 @@ stdenv.mkDerivation rec {
gst-plugins-base
(gst-plugins-good.override { gtkSupport = true; })
gst-libav
webkitgtk
discount
json-glib
];

cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF";