Skip to content

Commit ab35f48

Browse files
committed
Include pre-existing, libs, pkgconfig and frameworks for shell
1 parent cdc0caf commit ab35f48

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ in {
342342
# Converts from a `compoent.depends` value to a library derivation.
343343
# In the case of sublibs the `depends` value should already be the derivation.
344344
dependToLib = d:
345-
# Do simplify this to `d.components.library or d`, as that
345+
# Do not simplify this to `d.components.library or d`, as that
346346
# will not give a good error message if the `.library`
347347
# is missing (happens if the package is unplanned,
348348
# but has overrides).

test/shell-for-setup-deps/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ in recurseIntoAttrs ({
4444
cp ${./pkg/src}/*.hs .
4545
4646
printf "checking that the shell env has the dependencies...\n" >& 2
47-
${env.ghc}/bin/${env.ghc.targetPrefix}ghc-pkg list
47+
${env.ghc}/bin/${env.ghc.targetPrefix}ghc-pkg list -v
48+
${env.ghc}/bin/${env.ghc.targetPrefix}ghc-pkg check
4849
${env.ghc}/bin/${env.ghc.targetPrefix}runghc conduit-test.hs
4950
5051
touch $out

0 commit comments

Comments
 (0)