diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-06 21:09:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 21:09:52 +0100 |
| commit | 1ff873bc3ba365094afcc25215cd4d36357f8386 (patch) | |
| tree | d32b702c099097c0dd375e52061697219ebde79c /pkgs/applications/graphics | |
| parent | 313249641dc39eacb583770b040a7820d5c3c6af (diff) | |
| parent | 599cd39ec13f60e45ba7cbe445a7e0842060bf3b (diff) | |
| download | nixpkgs-1ff873bc3ba365094afcc25215cd4d36357f8386.tar nixpkgs-1ff873bc3ba365094afcc25215cd4d36357f8386.tar.gz nixpkgs-1ff873bc3ba365094afcc25215cd4d36357f8386.tar.bz2 nixpkgs-1ff873bc3ba365094afcc25215cd4d36357f8386.tar.lz nixpkgs-1ff873bc3ba365094afcc25215cd4d36357f8386.tar.xz nixpkgs-1ff873bc3ba365094afcc25215cd4d36357f8386.tar.zst nixpkgs-1ff873bc3ba365094afcc25215cd4d36357f8386.zip | |
Merge pull request #162816 from hqurve/fix-openboard
openboard: fix build
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/openboard/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index cf16ecc03cb..084787d6315 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, copyDesktopItems, makeDesktopItem, qmake , qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler , ffmpeg, libva, alsa-lib, SDL, x264, libvpx, libvorbis, libtheora, libogg , libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: @@ -32,6 +32,15 @@ in mkDerivation rec { sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M="; }; + patches = [ + # Poppler requires at least C++17 + (fetchpatch { + name = "use-c-17-for-pdf-on-linux-builds"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/use-c-17-for-pdf-on-linux-builds.patch?h=openboard"; + sha256 = "sha256-M6HigpOo8ul7qaub4cd7/ATUc85HezEyKyDuzsrZvC8="; + }) + ]; + postPatch = '' substituteInPlace OpenBoard.pro \ --replace '/usr/include/quazip' '${quazip}/include/QuaZip-Qt5-${quazip.version}/quazip' \ |