Skip to content

Commit 43a3bd5

Browse files
committed
travis: Add missing hunk in osx.patch
1 parent 8fb1ede commit 43a3bd5

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

.travis/osx.patch

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,18 @@ index 8d435cb..a8af409 100644
3737
- |
3838
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
3939
- cat cabal.project || true
40-
@@ -124,7 +124,7 @@ script:
40+
@@ -124,7 +124,14 @@ script:
4141
- touch cabal.project
4242
- |
4343
echo "packages: ${PKGDIR_threadscope}" >> cabal.project
44-
- - |
45-
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cp ${PKGDIR_threadscope}/cabal.project.osx cabal.project; fi
44+
- |
45+
+ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
46+
+ echo "constraints: gtk +have-quartz-gtk" >> cabal.project
47+
+ echo "package *" >> cabal.project
48+
+ echo " gcc-location: gcc-9" >> cabal.project
49+
+ echo "program-locations" >> cabal.project
50+
+ echo " gcc-location: gcc-9" >> cabal.project
51+
+ fi
4652
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
4753
- cat cabal.project || true
4854
- cat cabal.project.local || true

0 commit comments

Comments
 (0)