From a35a1b774cbb146728f02803478e203e541baefa Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Wed, 30 Jan 2019 18:04:37 +0100 Subject: [PATCH] nextflow 19.01.0 build 4 This commit changes the build script so that it modifies the NXF_DIST directory to the package path provided by Conda See https://github.com/nextflow-io/nextflow/issues/954 Signed-off-by: Paolo Di Tommaso --- recipes/nextflow/build.sh | 15 ++------------- recipes/nextflow/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/recipes/nextflow/build.sh b/recipes/nextflow/build.sh index 02599c45b28d0..b62e2cac7c694 100644 --- a/recipes/nextflow/build.sh +++ b/recipes/nextflow/build.sh @@ -1,17 +1,6 @@ mkdir -p $PREFIX/bin -sed "s|^NXF_HOME=.*|NXF_HOME=$PREFIX/share/$PKG_NAME|" nextflow > $PREFIX/bin/nextflow - -# Use $HOME for storing some temp files (friendlier for multiuser environments) -sed -i.bak "s|^ NXF_ASSETS=\${NXF_ASSETS:-\${NXF_HOME:-\$HOME/.nextflow}/assets}| NXF_ASSETS=\${NXF_ASSETS:=\"\$HOME/.nextflow/assets\"}|" $PREFIX/bin/nextflow -rm -f *.bak - -sed -i.bak "s|NXF_LAUNCHER=\${NXF_HOME}/tmp/launcher/nextflow-\${NXF_PACK}_\${NXF_VER}/\${NXF_HOST}|NXF_LAUNCHER=\$HOME/.nextflow/tmp/launcher/nextflow-\${NXF_PACK}_\${NXF_VER}/\${NXF_HOST}|" $PREFIX/bin/nextflow -rm -f *.bak - -sed -i.bak "s|^CAPSULE_CACHE_DIR=\${CAPSULE_CACHE_DIR:=\"\$NXF_HOME/capsule\"}|CAPSULE_CACHE_DIR=\${CAPSULE_CACHE_DIR:=\"\$HOME/.nextflow/capsule\"}|" $PREFIX/bin/nextflow -rm -f *.bak - -sed -i.bak "s|^JAVA_KEY=\"\$NXF_HOME/|JAVA_KEY=\"\$HOME/.nextflow/|" $PREFIX/bin/nextflow +sed "s|^NXF_DIST=.*|NXF_DIST=$PREFIX/share/$PKG_NAME/dist|" nextflow > $PREFIX/bin/nextflow +sed -i.bak "s|^CAPSULE_CACHE_DIR=.*|CAPSULE_CACHE_DIR=\${CAPSULE_CACHE_DIR:=$PREFIX/share/$PKG_NAME/capsule}|" $PREFIX/bin/nextflow rm -f *.bak chmod 755 $PREFIX/bin/nextflow diff --git a/recipes/nextflow/meta.yaml b/recipes/nextflow/meta.yaml index 93b1521d41786..35d292891b74e 100644 --- a/recipes/nextflow/meta.yaml +++ b/recipes/nextflow/meta.yaml @@ -5,7 +5,7 @@ package: version: {{ version }} build: - number: 3 + number: 4 noarch: generic source: