From f6187b425f27a5af53668c927b24c614685cc975 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sun, 17 Aug 2025 06:33:01 -0600 Subject: [PATCH 1/2] jansson: fix cmake import prefix --- pkgs/by-name/ja/jansson/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix index bb0035b97669..c949486def69 100644 --- a/pkgs/by-name/ja/jansson/package.nix +++ b/pkgs/by-name/ja/jansson/package.nix @@ -35,6 +35,12 @@ stdenv.mkDerivation (finalAttrs: { "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" ]; + postFixup = '' + # Incorrectly references the dev output, libjansson.so is in out + substituteInPlace $dev/lib/cmake/jansson/janssonTargets-release.cmake \ + --replace-fail "\''${_IMPORT_PREFIX}" "$out" + ''; + passthru = { tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; updateScript = nix-update-script { }; From b90a8d5d1d2f73d29100a5f95a9e8b100ee7db72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 18 Aug 2025 10:39:10 +0200 Subject: [PATCH 2/2] jansson: nit - more precision when replacing in .cmake --- pkgs/by-name/ja/jansson/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jansson/package.nix b/pkgs/by-name/ja/jansson/package.nix index c949486def69..1478f46feae7 100644 --- a/pkgs/by-name/ja/jansson/package.nix +++ b/pkgs/by-name/ja/jansson/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' # Incorrectly references the dev output, libjansson.so is in out substituteInPlace $dev/lib/cmake/jansson/janssonTargets-release.cmake \ - --replace-fail "\''${_IMPORT_PREFIX}" "$out" + --replace-fail "\''${_IMPORT_PREFIX}/lib" "$out/lib" ''; passthru = {