From f9dbeeb519dcfd93fd1698fd4da7662088bc1ba3 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 4 Jun 2025 11:00:14 +0200 Subject: [PATCH 1/4] sfcgal: 2.0.0 -> 2.1.0 --- pkgs/by-name/sf/sfcgal/cmake-fix.patch | 48 -------------------------- pkgs/by-name/sf/sfcgal/package.nix | 9 ++--- 2 files changed, 2 insertions(+), 55 deletions(-) delete mode 100644 pkgs/by-name/sf/sfcgal/cmake-fix.patch diff --git a/pkgs/by-name/sf/sfcgal/cmake-fix.patch b/pkgs/by-name/sf/sfcgal/cmake-fix.patch deleted file mode 100644 index 1614fe6323f3..000000000000 --- a/pkgs/by-name/sf/sfcgal/cmake-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07a6c2e5..37c33d92 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -221,7 +221,7 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})") - endif() - --SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") -+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - #SET(CMAKE_MACOSX_RPATH ON) - -@@ -260,6 +260,10 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" ) - else() - set( SFCGAL_LIB_NAME "SFCGAL" ) - endif() -+ -+if ( UNIX ) -+ include(GNUInstallDirs) -+endif() - #set( SFCGAL_LIB_NAME ${${CMAKE_BUILD_TYPE} - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/sfcgal-config.in ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config @ONLY) - install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/sfcgal-config DESTINATION bin ) -diff --git a/sfcgal-config.in b/sfcgal-config.in -index a0e992c5..49615c13 100755 ---- a/sfcgal-config.in -+++ b/sfcgal-config.in -@@ -1,6 +1,6 @@ - #!/bin/sh - prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ - - usage() - { -diff --git a/sfcgal.pc.in b/sfcgal.pc.in -index 968cb407..bf517d02 100644 ---- a/sfcgal.pc.in -+++ b/sfcgal.pc.in -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=${prefix} --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ - includedir=${prefix}/include - - Name: sfcgal diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix index dc2163ceb568..f863215740d0 100644 --- a/pkgs/by-name/sf/sfcgal/package.nix +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sfcgal"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "sfcgal"; repo = "SFCGAL"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-cx0QJCtAPR/WkWPpH+mZvq2803eDT7b+qlI5ma+CveE="; + hash = "sha256-m8oyfL3rF4qLugoEFa8iiqS5D1Oljg+x1qMp9KfiQ5c="; }; buildInputs = [ @@ -29,11 +29,6 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - patches = [ - # https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/384 - ./cmake-fix.patch - ]; - meta = { description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations"; homepage = "https://sfcgal.gitlab.io/SFCGAL/"; From f7c39aabe8ddb2330f76731db495b41a21985316 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 4 Jun 2025 13:40:38 +0200 Subject: [PATCH 2/4] sfcgal: use the tag attribute of fetchFromGitLab --- pkgs/by-name/sf/sfcgal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix index f863215740d0..c5c1cd91a676 100644 --- a/pkgs/by-name/sf/sfcgal/package.nix +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "sfcgal"; repo = "SFCGAL"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-m8oyfL3rF4qLugoEFa8iiqS5D1Oljg+x1qMp9KfiQ5c="; }; From 6c95a254e53328e7aeaf67150fef0b8653c703eb Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 4 Jun 2025 13:50:05 +0200 Subject: [PATCH 3/4] sfcgal: fix the license mistake, it is lgpl2Plus --- pkgs/by-name/sf/sfcgal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix index c5c1cd91a676..f93082056821 100644 --- a/pkgs/by-name/sf/sfcgal/package.nix +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C++ wrapper library around CGAL with the aim of supporting ISO 191007:2013 and OGC Simple Features for 3D operations"; homepage = "https://sfcgal.gitlab.io/SFCGAL/"; changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}"; - license = lib.licenses.lgpl2; + license = lib.licenses.lgpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ fqidz ]; teams = [ lib.teams.geospatial ]; From 766e53e84408664b5da0f1320339fb8d3800dd28 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Wed, 4 Jun 2025 13:51:18 +0200 Subject: [PATCH 4/4] sfcgal: switch platforms to unix as it builds on darwin --- pkgs/by-name/sf/sfcgal/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sf/sfcgal/package.nix b/pkgs/by-name/sf/sfcgal/package.nix index f93082056821..db7a0e806a80 100644 --- a/pkgs/by-name/sf/sfcgal/package.nix +++ b/pkgs/by-name/sf/sfcgal/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://sfcgal.gitlab.io/SFCGAL/"; changelog = "https://gitlab.com/sfcgal/SFCGAL/-/releases/v${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fqidz ]; teams = [ lib.teams.geospatial ]; };