From eac04af0e79dc5ceb0b89b81798b0bf4fa58a862 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Wed, 1 Feb 2023 11:47:10 -0600 Subject: fastqc: Use the spack built perl (#35276) The fastqc script was using the system perl. This PR sets the script to use the spack built/provided perl. This PR also removes the code that adds the java path. That should be handled by module loading as far as I know. --- var/spack/repos/builtin/packages/fastqc/package.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/var/spack/repos/builtin/packages/fastqc/package.py b/var/spack/repos/builtin/packages/fastqc/package.py index ff79d7b0c5..247c00dab7 100644 --- a/var/spack/repos/builtin/packages/fastqc/package.py +++ b/var/spack/repos/builtin/packages/fastqc/package.py @@ -22,6 +22,9 @@ class Fastqc(Package): patch("fastqc.patch", level=0) + def patch(self): + filter_file("/usr/bin/perl", self.spec["perl"].command.path, "fastqc", backup=False) + def install(self, spec, prefix): mkdir(prefix.bin) mkdir(prefix.lib) @@ -32,11 +35,3 @@ class Fastqc(Package): install_tree(d, join_path(prefix.lib, d)) chmod = which("chmod") chmod("+x", prefix.bin.fastqc) - - # In theory the 'run' dependency on 'jdk' above should take - # care of this for me. In practice, it does not. - def setup_run_environment(self, env): - """Add to the path; the package has a script at the - top level. - """ - env.prepend_path("PATH", self.spec["java"].prefix.bin) -- cgit v1.2.3-60-g2f50