Commit b542ec2c authored by Martin Häcker's avatar Martin Häcker
Browse files

collabora-online: fix build against poco-1.14 

This adds some missing includes for collabora online to actually use
the poco-json library.

Upstream pull request at
https://github.com/CollaboraOnline/online/issues/11175
parent a82c5f1e

pkgs/by-name/co/collabora-online/package.nix

+10 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
  cairo,

  cppunit,

  fetchFromGitHub,

  fetchpatch,

  fetchNpmDeps,

  lib,

  libcap,
@@ -63,7 +64,15 @@ stdenv.mkDerivation (finalAttrs: { 
    "--with-lokit-path=${libreoffice-collabora.src}/include"

  ];



  patches = [ ./fix-file-server-regex.patch ];

  patches = [

    ./fix-file-server-regex.patch

    # Remove after next release

    (fetchpatch {

      name = "add-missing-includes-for-poco-1.14.1";

      url = "https://patch-diff.githubusercontent.com/raw/CollaboraOnline/online/pull/11196.patch";

      hash = "sha256-ke4dOxITFHK3xMXIdp+zzUEGYMyDxMJrbbXTN+LaoVU=";

    })

  ];



  postPatch = ''

    cp ${./package-lock.json} ${finalAttrs.npmRoot}/package-lock.json