From 6acce347fb95aa181a80234a2f7ab8448b0d1e7f Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 3 Oct 2019 14:35:11 -0400 Subject: [PATCH] pdfpc: fix build with vala 0.46 --- pkgs/applications/misc/pdfpc/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index c0dca056476..1adab6b70a3 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -17,16 +17,20 @@ stdenv.mkDerivation rec { cmake pkgconfig vala # For setup hook gobject-introspection + wrapGAppsHook ]; buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler - libpthreadstubs makeWrapper librsvg pcre ]; + libpthreadstubs librsvg pcre ]; cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF"; - postInstall = '' - wrapProgram $out/bin/pdfpc \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - ''; + patches = [ + # Fix build vala 0.46 + (fetchpatch { + url = "https://github.com/pdfpc/pdfpc/commit/bbc16b97ecbdcdd22c2dc827a5c0e8b569073312.patch"; + sha256 = "0wi1rqcvg65cxnxvmvavcvghqyksnpijq1p91m57jaby3hb0pdcy"; + }) + ]; meta = with stdenv.lib; { description = "A presenter console with multi-monitor support for PDF files";