From 5332e5d3b52e5bd70b14fc5b491ea89dce32c88c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 17 Sep 2025 12:32:22 +0200 Subject: [PATCH] vcg: switch to CMake --- pkgs/by-name/vc/vcg/package.nix | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix index bf3f4a7ff8e5..8db97500a18f 100644 --- a/pkgs/by-name/vc/vcg/package.nix +++ b/pkgs/by-name/vc/vcg/package.nix @@ -3,6 +3,10 @@ stdenv, fetchFromGitHub, + fetchpatch, + + # nativeBuildInputs + cmake, # propagatedBuildInputs eigen, @@ -19,13 +23,29 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OZnqFnHGXC9fS7JCLTiHNCeA//JBAZGLB5SP/rGzaA8="; }; - propagatedBuildInputs = [ eigen ]; + patches = [ + # CMake: install lib and exports + # ref. https://github.com/cnr-isti-vclab/vcglib/pull/248 + # merged upstream + (fetchpatch { + name = "cmake-install-lib-and-exports.patch"; + url = "https://github.com/cnr-isti-vclab/vcglib/commit/4a8dd8d6e54890aee76917d27aabfa7031cbc68d.patch"; + hash = "sha256-b3qsmLu+4VSs943VS3C4gdG/PDR2mhr9/dDTmkep8zo="; + }) + ]; - installPhase = '' - mkdir -p $out/include - cp -r vcg wrap $out/include - find $out -name \*.h -exec sed -i 's,