aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devel/hs-haskell-language-server/Makefile12
-rw-r--r--devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server10
2 files changed, 11 insertions, 11 deletions
diff --git a/devel/hs-haskell-language-server/Makefile b/devel/hs-haskell-language-server/Makefile
index 2ad93a40b1b9..037ddbddfdee 100644
--- a/devel/hs-haskell-language-server/Makefile
+++ b/devel/hs-haskell-language-server/Makefile
@@ -210,6 +210,7 @@ USE_CABAL= Diff-0.4.0 \
zlib-0.6.2.3
SKIP_CABAL_PLIST= yes
+CABAL_PROJECT= append
EXECUTABLES= ${PORTNAME} \
${PORTNAME}-wrapper
@@ -219,17 +220,6 @@ PLIST_FILES= bin/${PORTNAME} \
bin/${PORTNAME}-8.10.4 \
bin/${PORTNAME}-wrapper
-post-extract:
- ${MV} ${WRKSRC}/cabal.project ${WRKSRC}/cabal.project.hls
-
-post-patch:
- echo "packages: " > ${WRKSRC}/cabal.project.port
-.for package in ${USE_CABAL}
- echo " ${package:C/_[0-9]+//}" >> ${WRKSRC}/cabal.project.port
-.endfor
- ${REINPLACE_CMD} '/ .\/shake-bench/d' ${WRKSRC}/cabal.project.hls
- ${CAT} ${WRKSRC}/cabal.project.port ${WRKSRC}/cabal.project.hls > ${WRKSRC}/cabal.project
-
do-build:
cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} HOME=${CABAL_HOME} hls-install hls
diff --git a/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server b/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server
new file mode 100644
index 000000000000..96f8458a3c07
--- /dev/null
+++ b/devel/hs-haskell-language-server/files/patch-cabal.project.haskell-language-server
@@ -0,0 +1,10 @@
+--- cabal.project.haskell-language-server.orig 2021-04-13 07:56:15 UTC
++++ cabal.project.haskell-language-server
+@@ -1,7 +1,6 @@
+ packages:
+ ./
+ ./hie-compat
+- ./shake-bench
+ ./ghcide
+ ./hls-plugin-api
+ ./hls-test-utils