Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

beamerpresenter: 0.1.3 -> 0.2.0 #122395

Merged
merged 2 commits into from May 10, 2021
Merged

Conversation

pacien
Copy link
Contributor

@pacien pacien commented May 9, 2021

Motivation for this change

This updates the beamerpresenter package to its latest release.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
    • Opened some PDF and used the app
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

r-rmcgibbo commented May 9, 2021

Result of nixpkgs-review pr 122395 at 5b5386e3 run on x86_64-linux 1

1 package built successfully:
  • beamerpresenter
20 suggestions:
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/usr/' doesn't match anything in file 'src/drawing/abstractgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/usr/' doesn't match anything in file 'src/drawing/pixmapgraphicsitem.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '$${GUI_CONFIG_PATH}' doesn't match anything in file 'config/beamerpresenter.conf'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '$${GUI_CONFIG_PATH}' doesn't match anything in file 'src/drawing/basicgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/usr/' doesn't match anything in file 'src/drawing/basicgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '$${GUI_CONFIG_PATH}' doesn't match anything in file 'src/drawing/drawtool.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '$${GUI_CONFIG_PATH}' doesn't match anything in file 'src/drawing/fullgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '$${GUI_CONFIG_PATH}' doesn't match anything in file 'src/drawing/flexgraphicslineitem.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/etc/' doesn't match anything in file 'src/drawing/fullgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/usr/' doesn't match anything in file 'src/drawing/fullgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/etc/' doesn't match anything in file 'src/drawing/flexgraphicslineitem.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/etc/' doesn't match anything in file 'src/drawing/drawtool.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/usr/' doesn't match anything in file 'src/drawing/drawtool.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/etc/' doesn't match anything in file 'src/drawing/abstractgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/usr/' doesn't match anything in file 'src/drawing/pathcontainer.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/usr/' doesn't match anything in file 'src/drawing/flexgraphicslineitem.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/etc/' doesn't match anything in file 'src/drawing/pathcontainer.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '$${GUI_CONFIG_PATH}' doesn't match anything in file 'src/drawing/abstractgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '$${GUI_CONFIG_PATH}' doesn't match anything in file 'src/drawing/pathcontainer.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    
  • warning: stale-substitute

    Stale substituteInPlace detected.
    substituteStream(): WARNING: pattern '/etc/' doesn't match anything in file 'src/drawing/basicgraphicspath.h'
    Near pkgs/applications/office/beamerpresenter/default.nix:31:0:

       |
    31 |     description = "Modular multi screen pdf presentation software respecting your window manager";
       | ^
    

Result of nixpkgs-review pr 122395 at 5b5386e3 run on aarch64-linux 1

1 package built successfully:
  • beamerpresenter

Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be nice to fix darwin build as well:

diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix
index e9543a09593..351609d8c05 100644
--- a/pkgs/applications/office/beamerpresenter/default.nix
+++ b/pkgs/applications/office/beamerpresenter/default.nix
@@ -1,15 +1,17 @@
-{ lib, mkDerivation, fetchFromGitHub, installShellFiles,
-  qmake, qtbase, qtmultimedia,
-  poppler, mupdf, jbig2dec, openjpeg, gumbo,
+{ lib, stdenv, fetchFromGitHub, installShellFiles,
+  qmake, qtbase, qtmultimedia, wrapQtAppsHook,
+  poppler, mupdf, freetype, jbig2dec, openjpeg, gumbo,
   renderer ? "mupdf" }:
 
 let
   renderers = {
-    mupdf.buildInputs = [ mupdf jbig2dec openjpeg gumbo ];
+    mupdf.buildInputs = [ mupdf freetype jbig2dec openjpeg gumbo ];
     poppler.buildInputs = [ poppler ];
   };
 
-in mkDerivation rec {
+in
+
+stdenv.mkDerivation rec {
   pname = "beamerpresenter";
   version = "0.2.0";
 
@@ -20,7 +22,7 @@ in mkDerivation rec {
     sha256 = "10i5nc5b5syaqvsixam4lmfiz3b5cphbjfgfqavi5jilq769792a";
   };
 
-  nativeBuildInputs = [ qmake installShellFiles ];
+  nativeBuildInputs = [ qmake installShellFiles wrapQtAppsHook ];
   buildInputs = [ qtbase qtmultimedia ] ++ renderers.${renderer}.buildInputs;
 
   qmakeFlags = [ "RENDERER=${renderer}" ];
@@ -35,6 +37,10 @@ in mkDerivation rec {
     done
   '';
 
+  postInstall = lib.optionalString stdenv.isDarwin ''
+    wrapQtApp "$out"/bin/beamerpresenter.app/Contents/MacOS/beamerpresenter
+  '';
+
   meta = with lib; {
     description = "Modular multi screen pdf presentation software respecting your window manager";
     homepage = "https://github.com/stiglers-eponym/BeamerPresenter";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0334a03c75f..74152f3fd51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3214,7 +3214,14 @@ in
 
   bdsync = callPackage ../tools/backup/bdsync { };
 
-  beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { };
+  beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter {
+    # developed for a compiler with C++20 support
+    stdenv =
+      if stdenv.isDarwin then
+        overrideCC stdenv clang_10
+      else
+        stdenv;
+  };
 
   beanstalkd = callPackage ../servers/beanstalkd { };
 

@cole-h
Copy link
Member

cole-h commented May 10, 2021

@ofborg eval

@pacien
Copy link
Contributor Author

pacien commented May 10, 2021

@veprbl wrote:

Would be nice to fix darwin build as well:
[patch]

Thanks; patch committed.

@veprbl
Copy link
Member

veprbl commented May 10, 2021

Result of nixpkgs-review pr 122395 run on x86_64-darwin 1

1 package built:
  • beamerpresenter

@veprbl veprbl merged commit a5fd5c3 into NixOS:master May 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants