From 18e4ed738312e03f66e5b9b0b458beeed0e5a9a1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Nov 2025 13:51:31 +0100 Subject: [PATCH 1/2] haskellPackages.pdftotext: move jailbreak into overrideCabal --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d31e2e788679..cc24b84c8ea4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2932,6 +2932,7 @@ with haskellLib; zinza = dontCheck super.zinza; pdftotext = overrideCabal (drv: { + jailbreak = true; postPatch = '' # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6 substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources @@ -2943,7 +2944,7 @@ with haskellLib; substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause '' + (drv.postPatch or ""); - }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext))); + }) (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)); # QuickCheck <2.15 # https://github.com/google/proto-lens/issues/403 From 2f1f72d5a2ea8d96f5ba200567815cb6d43d79f3 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 7 Nov 2025 13:53:56 +0100 Subject: [PATCH 2/2] haskellPackages.pdftotext: use existing poppler-cpp input This is correctly added to libraryPkgconfigDepends where it needs to go. We could drop this in the future if we add a corresponding mapping to cabal2nix. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cc24b84c8ea4..ce2c3143bb67 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2944,7 +2944,7 @@ with haskellLib; substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause '' + (drv.postPatch or ""); - }) (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)); + }) (super.pdftotext.override { poppler-cpp = pkgs.poppler; }); # QuickCheck <2.15 # https://github.com/google/proto-lens/issues/403