Merge staging-next into staging

1 files changed, 28 insertions, 17 deletions

diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index 4e8bcaee019..351609d8c05 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -1,39 +1,50 @@
-{ lib, mkDerivation, fetchFromGitHub, installShellFiles,
-  qmake, qtbase, poppler, qtmultimedia }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles,
+  qmake, qtbase, qtmultimedia, wrapQtAppsHook,
+  poppler, mupdf, freetype, jbig2dec, openjpeg, gumbo,
+  renderer ? "mupdf" }:
 
-mkDerivation rec {
+let
+  renderers = {
+    mupdf.buildInputs = [ mupdf freetype jbig2dec openjpeg gumbo ];
+    poppler.buildInputs = [ poppler ];
+  };
+
+in
+
+stdenv.mkDerivation rec {
   pname = "beamerpresenter";
-  version = "0.1.3";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "stiglers-eponym";
     repo = "BeamerPresenter";
     rev = "v${version}";
-    sha256 = "1nbcqrfdjcsc6czqk1v163whka4x1w883b1298aws8yi7vac4f1i";
+    sha256 = "10i5nc5b5syaqvsixam4lmfiz3b5cphbjfgfqavi5jilq769792a";
   };
 
-  nativeBuildInputs = [ qmake installShellFiles ];
-  buildInputs = [ qtbase qtmultimedia poppler ];
+  nativeBuildInputs = [ qmake installShellFiles wrapQtAppsHook ];
+  buildInputs = [ qtbase qtmultimedia ] ++ renderers.${renderer}.buildInputs;
+
+  qmakeFlags = [ "RENDERER=${renderer}" ];
 
   postPatch = ''
-    # Fix location of poppler-*.h
     shopt -s globstar
-    for f in **/*.{h,cpp}; do
-      substituteInPlace $f --replace '#include <poppler-' '#include <poppler/qt5/poppler-'
+    for f in **/*.{pro,conf,h,cpp}; do
+      substituteInPlace "$f" \
+        --replace "/usr/" "$out/" \
+        --replace "/etc/" "$out/etc/" \
+        --replace '$${GUI_CONFIG_PATH}' "$out/etc/xdg/beamerpresenter/gui.json"
     done
   '';
 
-  installPhase = ''
-    install -m755 beamerpresenter -Dt $out/bin/
-    install -m644 src/icons/beamerpresenter.svg -Dt $out/share/icons/hicolor/scalable/apps/
-    install -m644 share/applications/beamerpresenter.desktop -Dt $out/share/applications/
-    installManPage man/*.{1,5}
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    wrapQtApp "$out"/bin/beamerpresenter.app/Contents/MacOS/beamerpresenter
   '';
 
   meta = with lib; {
-    description = "Simple dual screen pdf presentation software";
+    description = "Modular multi screen pdf presentation software respecting your window manager";
     homepage = "https://github.com/stiglers-eponym/BeamerPresenter";
-    license = licenses.gpl3Plus;
+    license = licenses.agpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pacien ];
   };