9de367cde0
Due to change of behaviour of --modversion Behavior is reverted in pkgconf-2.0 cabal-install-solver: pkgconf-1.9 --modversion ignores multiple packages
22 lines
1 KiB
Diff
22 lines
1 KiB
Diff
--- cabal-install-solver-3.8.1.0/src/Distribution/Solver/Types/PkgConfigDb.hs~ 2001-09-09 09:46:40.000000000 +0800
|
|
+++ cabal-install-solver-3.8.1.0/src/Distribution/Solver/Types/PkgConfigDb.hs 2023-11-03 02:05:41.798304907 +0800
|
|
@@ -21,7 +21,7 @@
|
|
) where
|
|
|
|
import Distribution.Solver.Compat.Prelude
|
|
-import Prelude ()
|
|
+import Prelude (mapM)
|
|
|
|
import Control.Exception (handle)
|
|
import qualified Data.Map as M
|
|
@@ -65,8 +65,8 @@
|
|
-- The output of @pkg-config --list-all@ also includes a description
|
|
-- for each package, which we do not need.
|
|
let pkgNames = map (takeWhile (not . isSpace)) pkgList
|
|
- pkgVersions <- lines <$> getProgramOutput verbosity pkgConfig
|
|
- ("--modversion" : pkgNames)
|
|
+ pkgVersions <- mapM (\p -> getProgramOutput verbosity pkgConfig
|
|
+ ("--modversion" : [p])) pkgNames
|
|
(return . pkgConfigDbFromList . zip pkgNames) pkgVersions
|
|
where
|
|
-- For when pkg-config invocation fails (possibly because of a
|