patch applied (cabal-branches/cabal-1.6): Simplify previous pkg-config fix