From 0eb9c3225baadc40ea28df4eea6369806d0f81a1 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 26 Jan 2025 16:30:38 -0800 Subject: [PATCH] clipper2: 1.4.0 -> 1.5.2 --- pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch | 14 -------------- pkgs/by-name/cl/clipper2/package.nix | 8 ++------ 2 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch diff --git a/pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch b/pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch deleted file mode 100644 index 93407d5f9ff6..000000000000 --- a/pkgs/by-name/cl/clipper2/0001-fix-pc-paths.patch +++ /dev/null @@ -1,14 +0,0 @@ -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++ diff --git a/pkgs/by-name/cl/clipper2/package.nix b/pkgs/by-name/cl/clipper2/package.nix index a2e088acaa73..e48717fea11c 100644 --- a/pkgs/by-name/cl/clipper2/package.nix +++ b/pkgs/by-name/cl/clipper2/package.nix @@ -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 = ''