Commit 4a1a1058 authored by Sergei Trofimovich's avatar Sergei Trofimovich Committed by Martin Häcker
Browse files

poco: 1.13.3 -> 1.14.1 

Changes:
- https://github.com/pocoproject/poco/releases/tag/poco-1.14.0-release
- https://github.com/pocoproject/poco/releases/tag/poco-1.14.1-release
parent 3eb000d6

pkgs/by-name/po/poco/package.nix

+19 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  cmake,

  pkg-config,

  zlib,
@@ -10,18 +11,19 @@ 
  sqlite,

  openssl,

  unixODBC,

  utf8proc,

  libmysqlclient,

}:



stdenv.mkDerivation rec {

  pname = "poco";



  version = "1.13.3";

  version = "1.14.1";



  src = fetchFromGitHub {

    owner = "pocoproject";

    repo = "poco";

    sha256 = "sha256-ryBQjzg1DyYd/LBZzjHxq8m/7ZXRSKNNGRkIII0eHK0=";

    hash = "sha256-acq2eja61sH/QHwMPmiDNns2jvXRTk0se/tHj9XRSiU=";

    rev = "poco-${version}-release";

  };
@@ -32,8 +34,10 @@ stdenv.mkDerivation rec { 


  buildInputs = [

    unixODBC

    utf8proc

    libmysqlclient

  ];



  propagatedBuildInputs = [

    zlib

    pcre2
@@ -50,8 +54,19 @@ stdenv.mkDerivation rec { 
  MYSQL_DIR = libmysqlclient;

  MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";



  configureFlags = [

    "--unbundled"

  cmakeFlags = [

    # use nix provided versions of sqlite, zlib, pcre, expat, ... instead of bundled versions

    (lib.cmakeBool "POCO_UNBUNDLED" true)

  ];



  patches = [

    # Remove on next release

    (fetchpatch {

      name = "disable-included-pcre-if-pcre-is-linked-staticly";

      # this happens when building pkgsStatic.poco

      url = "https://patch-diff.githubusercontent.com/raw/pocoproject/poco/pull/4879.patch";

      hash = "sha256-VFWuRuf0GPYFp43WKI8utl+agP+7a5biLg7m64EMnVo=";

    })

  ];



  postFixup = ''