Unverified Commit 062fa9ca authored by Marcus Ramberg's avatar Marcus Ramberg Committed by GitHub
Browse files

perlPackages.Tirex: 0.7.1 → 0.8.0 (#431033)

parents 7508c436 4f9fee9b

pkgs/development/perl-modules/Tirex/default.nix

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

  buildPerlPackage,

  fetchFromGitHub,

  fetchpatch,

  GD,

  IPCShareLite,

  JSON,
@@ -15,22 +14,16 @@ 


buildPerlPackage rec {

  pname = "Tirex";

  version = "0.7.1";

  version = "0.8.0";



  src = fetchFromGitHub {

    owner = "openstreetmap";

    repo = "tirex";

    tag = "v${version}";

    hash = "sha256-p2P19tifA/AvJatTzboyhtt7W1SwKJQzqpU4oDalfhU=";

    hash = "sha256-tFDyN3slj9ipa9JPB6f+mnzMIW926vOge4ZSbmxjtiE=";

  };



  patches = [

    # Support Mapnik >= v4.0.0 (`mapnik/box2d.hpp` -> `mapnik/geometry/box2d.hpp`)

    # https://github.com/openstreetmap/tirex/pull/54

    (fetchpatch {

      url = "https://github.com/openstreetmap/tirex/commit/5f131231c9c12e88793afba471b150ca8af8d587.patch";

      hash = "sha256-bnL1ZGy8ZNSZuCRbZn59qRVLg3TL0GjFYnhRKroeVO0=";

    })

    # Support Mapnik >= v4.0.0 (no more mapnik-config)

    ./use-pkg-config.patch

  ];

pkgs/development/perl-modules/Tirex/use-pkg-config.patch

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
-CXXFLAGS = `mapnik-config --cflags` $(CFLAGS)

+CXXFLAGS += `pkg-config --cflags libmapnik` -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64

 CXXFLAGS += -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wold-style-cast

-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs`

-LDFLAGS= `mapnik-config --libs --ldflags --dep-libs` -lboost_filesystem

+LDFLAGS += `pkg-config --libs libmapnik` -lboost_filesystem



 backend-mapnik: renderd.o metatilehandler.o networklistener.o networkmessage.o networkrequest.o networkresponse.o debuggable.o requesthandler.o