From 683e8fa08bbd9e88785228618c6ea3deb62dc6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Wed, 15 Jul 2026 17:44:58 +0200 Subject: [PATCH 1/2] geographiclib: fix multi-output CMake import prefix The dev/out output split moved lib/cmake into $dev while the shared library and executables stayed in $out. The exported targets file uses relative ${_IMPORT_PREFIX} paths, so find_package(GeographicLib) resolved libraries and binaries under $dev and failed to link. Drop the dev output so lib/cmake ships alongside the library in $out and ${_IMPORT_PREFIX} resolves correctly; keep the doc output split off. Assisted-by: Claude Code Opus 4.8 --- pkgs/by-name/ge/geographiclib/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix index 9f915f128d89..34069f754fd7 100644 --- a/pkgs/by-name/ge/geographiclib/package.nix +++ b/pkgs/by-name/ge/geographiclib/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: { }; outputs = [ - "dev" "doc" "out" ]; From 90791e4c643f5d15154389a5114055f9cb7d71f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Wed, 15 Jul 2026 17:44:58 +0200 Subject: [PATCH 2/2] supercell-wx: drop geographiclib single-output workaround geographiclib now ships its CMake package files alongside the shared library in $out, so find_package(GeographicLib) works with the default multi-output package. Assisted-by: Claude Code Opus 4.8 --- pkgs/by-name/su/supercell-wx/package.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index 9631281f6046..3425406e42e6 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -126,10 +126,7 @@ buildStdenv.mkDerivation (finalAttrs: { boost bzip2 geos - # FIXME: split outputs aren't working with find_package. Possibly related to nixpkgs/issues/144170 ? - (geographiclib.overrideAttrs { - outputs = [ "out" ]; - }) + geographiclib glew glm gtest