File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed
cabal-install-solver/src/Distribution/Solver/Types Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -67,11 +67,12 @@ readPkgConfigDb verbosity progdb = handle ioErrorHandler $ do
6767 -- The output of @pkg-config --list-all@ also includes a description
6868 -- for each package, which we do not need.
6969 let pkgNames = map (takeWhile (not . isSpace)) pkgList
70- (pkgVersions , _errs, exitCode) <-
70+ (outs , _errs, exitCode) <-
7171 getProgramInvocationOutputAndErrors verbosity
7272 (programInvocation pkgConfig (" --modversion" : pkgNames))
73- if exitCode == ExitSuccess && length pkgNames == length pkgList
74- then (return . pkgConfigDbFromList . zip pkgNames) (lines pkgVersions)
73+ let pkgVersions = lines outs
74+ if exitCode == ExitSuccess && length pkgVersions == length pkgNames
75+ then (return . pkgConfigDbFromList . zip pkgNames) pkgVersions
7576 else
7677 -- if there's a single broken pc file the above fails, so we fall back
7778 -- into calling it individually
Original file line number Diff line number Diff line change 1+ synopsis: fix pkgconfig-depends for pkgconf-1.9
2+ packages: cabal-install-solver
3+ prs: #9391
4+ issues: #8923
You can’t perform that action at this time.
0 commit comments