Unverified Commit 7e26be43 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

clipper2: 1.4.0 -> 1.5.2 (#377173)

parents 34949ce0 0eb9c322

pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
diff --git a/Clipper2.pc.cmakein b/Clipper2.pc.cmakein

index 5632c93..0a5d6ba 100644

--- a/Clipper2.pc.cmakein

+++ b/Clipper2.pc.cmakein

@@ -1,7 +1,7 @@

 prefix=@CMAKE_INSTALL_PREFIX@

 exec_prefix=${prefix}

-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@

-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@

+libdir=@CMAKE_INSTALL_FULL_LIBDIR@

+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@



 Name: Clipper2@PCFILE_LIB_SUFFIX@

 Description: A Polygon Clipping and Offsetting library in C++

pkgs/by-name/cl/clipper2/package.nix

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


stdenv.mkDerivation rec {

  pname = "clipper2";

  version = "1.4.0";

  version = "1.5.2";



  src = fetchFromGitHub {

    owner = "AngusJohnson";

    repo = "Clipper2";

    rev = "Clipper2_${version}";

    hash = "sha256-ASL9uKkXsWyIbD1qaKEL7gf/JuCqzZQZSKHwLT5dKJU=";

    hash = "sha256-UsTOqejcN8our4UswFBvPC5fV52qJfjQYoVMEU6vDPE=";

  };



  sourceRoot = "${src.name}/CPP";
@@ -28,10 +28,6 @@ stdenv.mkDerivation rec { 
    "-DBUILD_SHARED_LIBS=ON"

  ];



  patches = [

    ./0001-fix-pc-paths.patch

  ];



  meta = {

    description = "Polygon Clipping and Offsetting - C++ Only";

    longDescription = ''