getting FW_SEARCH_PATH FHICL_FILE_PATH and CET_PLUGIN_PATH mostly con…

…sistent with UPS packages, using setup_run_environment
FNALssi · Apr 3, 2024 · c568597 · c568597
1 parent 08b71f0
commit c568597
Show file tree

Hide file tree

Showing 67 changed files with 116 additions and 151 deletions.
diff --git a/packages/art-root-io/package.py b/packages/art-root-io/package.py
@@ -99,9 +99,7 @@ def setup_dependent_build_environment(self, env, dependent_spec):
         # Cleanup.
         sanitize_environments(env, "CET_PLUGIN_PATH")
 
-    def setup_dependent_run_environment(self, env, dependent_spec):
+    def setup_run_environment(self, env):
         prefix = self.prefix
         # Ensure we can find plugin libraries.
         env.prepend_path("CET_PLUGIN_PATH", prefix.lib)
-        # Cleanup.
-        sanitize_environments(env, "CET_PLUGIN_PATH")
diff --git a/packages/art/package.py b/packages/art/package.py
@@ -111,11 +111,9 @@ def setup_dependent_build_environment(self, env, dependent_spec):
         # Cleaup.
         sanitize_environments(env, "CET_PLUGIN_PATH", "PERL5LIB")
 
-    def setup_dependent_run_environment(self, env, dependent_spec):
+    def setup_run_environment(self, env):
         prefix = self.prefix
         # Ensure we can find plugin libraries.
         env.prepend_path("CET_PLUGIN_PATH", prefix.lib)
         # Perl modules.
         env.prepend_path("PERL5LIB", os.path.join(prefix, "perllib"))
-        # Cleaup.
-        sanitize_environments(env, "CET_PLUGIN_PATH", "PERL5LIB")
diff --git a/packages/artg4tk/package.py b/packages/artg4tk/package.py
@@ -72,3 +72,8 @@ def setup_build_environment(self, spack_env):
         spack_env.set("CETBUILDTOOLS_VERSION", self.spec["cetmodules"].version)
         spack_env.set("CETBUILDTOOLS_DIR", self.spec["cetmodules"].prefix)
         spack_env.set("LD_LIBRARY_PATH", self.spec["root"].prefix.lib)
+
+    def setup_run_environment(self, run_env):
+        run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        run_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
+        run_env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
diff --git a/packages/bxdecay0/package.py b/packages/bxdecay0/package.py
@@ -128,10 +128,8 @@ def setup_dependent_build_environment(self, spack_env, dependent_spec):
         # Cleanup.
         sanitize_environments(spack_env)
 
-    def setup_dependent_run_environment(self, run_env, dependent_spec):
+    def setup_run_environment(self, run_env):
         # Binaries.
         run_env.prepend_path("PATH", self.prefix.bin)
         # Ensure Root can find headers for autoparsing.
         run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
-        # Cleanup.
-        sanitize_environments(run_env)
diff --git a/packages/canvas-root-io/package.py b/packages/canvas-root-io/package.py
@@ -112,14 +112,12 @@ def setup_dependent_build_environment(self, env, dependent_spec):
         sanitize_environments(env, "CET_PLUGIN_PATH", "LD_LIBRARY_PATH", "ROOT_INCLUDE_PATH")
 
     def setup_dependent_run_environment(self, env, dependent_spec):
-        prefix = self.prefix
-        # Set LD_LIBRARY_PATH so CheckClassVersion.py can find cppyy lib
-        env.prepend_path("LD_LIBRARY_PATH", join_path(self.spec["root"].prefix.lib))
-        env.prepend_path("LD_LIBRARY_PATH", join_path(self.spec["root"].prefix.lib,"root"))
         # Ensure Root can find headers for autoparsing.
         for d in dependent_spec.traverse(
             root=False, cover="nodes", order="post", deptype=("link"), direction="children"
         ):
             env.prepend_path("ROOT_INCLUDE_PATH", str(dependent_spec[d.name].prefix.include))
-        # Cleanup.
-        sanitize_environments(env, "CET_PLUGIN_PATH", "LD_LIBRARY_PATH", "ROOT_INCLUDE_PATH")
+
+    def setup_run_environment(self, run_env):
+        run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        run_env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
diff --git a/packages/canvas/package.py b/packages/canvas/package.py
@@ -76,3 +76,7 @@ def setup_build_environment(self, env):
         env.prepend_path("PATH", os.path.join(prefix, "bin"))
         # Cleanup.
         sanitize_environments(env, "PATH")
+
+    def setup_run_environment(self, run_env):
+        run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        run_env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
diff --git a/packages/cetlib-except/package.py b/packages/cetlib-except/package.py
@@ -61,3 +61,7 @@ def setup_build_environment(self, env):
         env.prepend_path("PATH", os.path.join(self.build_directory, "bin"))
         # Cleanup.
         sanitize_environments(env, "PATH")
+
+    def setup_run_environment(self, run_env):
+        run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        run_env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
diff --git a/packages/cetlib/package.py b/packages/cetlib/package.py
@@ -94,9 +94,11 @@ def setup_dependent_build_environment(self, env, dependent_spec):
         # Cleanup.
         sanitize_environments(env, "PERL5LIB")
 
-    def setup_dependent_run_environment(self, env, dependent_spec):
+    def setup_run_environment(self, env):
         prefix = self.prefix
+        env.prepend_path("PATH", self.prefix.bin)
         # Perl modules.
         env.prepend_path("PERL5LIB", os.path.join(prefix, "perllib"))
         # Cleanup.
         sanitize_environments(env, "PERL5LIB")
+        env.prepend_path("CET_PLUGIN_PATH", prefix.lib )
diff --git a/packages/cry/package.py b/packages/cry/package.py
@@ -67,12 +67,11 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         spack_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.src)
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         run_env.set("CRYHOME", self.prefix)
         run_env.set("CRY_LIB", self.prefix.lib)
         run_env.set("CRYDATAPATH", self.prefix.data)
         # Ensure we can find plugin libraries.
-        run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.src)
 
     @run_after("install")

diff --git a/packages/dk2nudata/package.py b/packages/dk2nudata/package.py
@@ -55,6 +55,6 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.set("DK2NUDATA_LIB", self.prefix.lib)
         spack_env.set("DK2NUDATA_INC", self.prefix.include)
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
diff --git a/packages/dunetpc/package.py b/packages/dunetpc/package.py
@@ -120,7 +120,7 @@ def setup_dependent_build_environment(self, spack_env, dependent_spec):
         # Cleanup.
         sanitize_environments(spack_env)
 
-    def setup_dependent_run_environment(self, run_env, dependent_spec):
+    def setup_run_environment(self, run_env):
         # Binaries.
         run_env.prepend_path("PATH", self.prefix.bin)
         # Ensure we can find plugin libraries.
@@ -129,5 +129,3 @@ def setup_dependent_run_environment(self, run_env, dependent_spec):
         run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
         # Perl modules.
         run_env.prepend_path("PERL5LIB", os.path.join(self.prefix, "perllib"))
-        # Cleanup.
-        sanitize_environments(run_env)
diff --git a/packages/fhicl-cpp/package.py b/packages/fhicl-cpp/package.py
@@ -78,8 +78,11 @@ def setup_build_environment(self, env):
         sanitize_environments(env, "PATH")
 
     def setup_run_environment(self, env):
-        bindir = self.prefix.bin
+        env.prepend_path("PATH", self.prefix.bin)
+        env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
         # Bash completions.
+        bindir = self.prefix.bin
         env.from_sourcing_file(os.path.join(bindir, "fhicl-dump_completions"))
         env.from_sourcing_file(os.path.join(bindir, "fhicl-expand_completions"))
         env.from_sourcing_file(os.path.join(bindir, "fhicl-get_completions"))
diff --git a/packages/gallery/package.py b/packages/gallery/package.py
@@ -75,3 +75,11 @@ def setup_dependent_build_environment(self, env, dependent_spec):
         env.prepend_path("CET_PLUGIN_PATH", prefix.lib)
         # Cleaup.
         sanitize_environments(env, "CET_PLUGIN_PATH")
+
+    def setup_run_environment(self, run_env):
+        run_env.prepend_path("PATH", self.prefix.bin)
+        run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        run_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
+        run_env.append_path("FW_SEARCH_PATH", "{0}/fw".format(self.prefix))
+        run_env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
+
diff --git a/packages/genie/package.py b/packages/genie/package.py
@@ -217,7 +217,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("ROOT_INCLUDE_PATH", "{0}/GENIE".format(self.prefix.include))
         spack_env.append_path("LD_LIBRARY_PATH", self.prefix.lib)
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         run_env.set("GENIE", self.prefix)
         run_env.set("GENIE_VERSION", "v{0}".format(self.version.underscored))
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/hep-concurrency/package.py b/packages/hep-concurrency/package.py
@@ -71,3 +71,7 @@ def setup_build_environment(self, env):
         env.prepend_path("PATH", os.path.join(prefix, "bin"))
         # Cleanup.
         sanitize_environments(env, "PATH")
+
+    def setup_run_environment(self, run_env):
+        run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        run_env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
diff --git a/packages/icarus-signal-processing/package.py b/packages/icarus-signal-processing/package.py
@@ -133,7 +133,7 @@ def setup_dependent_build_environment(self, spack_env, dependent_spec):
         # Cleanup.
         sanitize_environments(spack_env)
 
-    def setup_dependent_run_environment(self, run_env, dependent_spec):
+    def setup_run_environment(self, run_env):
         # Binaries.
         run_env.prepend_path("PATH", self.prefix.bin)
         # Ensure we can find plugin libraries.
@@ -142,5 +142,3 @@ def setup_dependent_run_environment(self, run_env, dependent_spec):
         run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
         # Perl modules.
         run_env.prepend_path("PERL5LIB", os.path.join(self.prefix, "perllib"))
-        # Cleanup.
-        sanitize_environments(run_env)
diff --git a/packages/icarusalg/package.py b/packages/icarusalg/package.py
@@ -197,7 +197,7 @@ def setup_dependent_build_environment(self, spack_env, dependent_spec):
         # Cleanup.
         sanitize_environments(spack_env)
 
-    def setup_dependent_run_environment(self, run_env, dependent_spec):
+    def setup_run_environment(self, run_env):
         # Binaries.
         run_env.prepend_path("PATH", self.prefix.bin)
         # Ensure we can find plugin libraries.
@@ -208,5 +208,3 @@ def setup_dependent_run_environment(self, run_env, dependent_spec):
         run_env.prepend_path("PERL5LIB", os.path.join(self.prefix, "perllib"))
         #
         run_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
-        # Cleanup.
-        sanitize_environments(run_env)
diff --git a/packages/icaruscode/package.py b/packages/icaruscode/package.py
@@ -212,7 +212,7 @@ def setup_dependent_build_environment(self, spack_env, dependent_spec):
         # Cleanup.
         sanitize_environments(spack_env)
 
-    def setup_dependent_run_environment(self, run_env, dependent_spec):
+    def setup_run_environment(self, run_env):
         # Binaries.
         run_env.prepend_path("PATH", self.prefix.bin)
         # Ensure we can find plugin libraries.
@@ -223,5 +223,3 @@ def setup_dependent_run_environment(self, run_env, dependent_spec):
         run_env.prepend_path("PERL5LIB", os.path.join(self.prefix, "perllib"))
         # FW search path
         run_env.append_path("FW_SEARCH_PATH", os.path.join(self.prefix, "fw"))
-        # Cleanup.
-        sanitize_environments(run_env)
diff --git a/packages/icarusutil/package.py b/packages/icarusutil/package.py
@@ -98,7 +98,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/job".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/ifbeam/package.py b/packages/ifbeam/package.py
@@ -76,5 +76,5 @@ def setup_run_unvironment(self, run_env):
     def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.set("IFBEAM_DIR", self.prefix)
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         run_env.set("IFBEAM_DIR", self.prefix)
diff --git a/packages/ifdh-art/package.py b/packages/ifdh-art/package.py
@@ -91,7 +91,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         spack_env.prepend_path("PATH", self.prefix.bin)
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/ifdhc/package.py b/packages/ifdhc/package.py
@@ -125,7 +125,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.set("IFDHC_DIR", self.spec.prefix)
         spack_env.set("IFDHC_INC", self.spec.prefix.inc)
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         run_env.prepend_path("PATH", self.prefix.bin)
         # Non-standard, therefore we have to do it ourselves.
         run_env.prepend_path("ROOT_INCLUDE_PATH", self.spec.prefix.inc)

diff --git a/packages/larana/package.py b/packages/larana/package.py
@@ -130,7 +130,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/larcore/package.py b/packages/larcore/package.py
@@ -143,15 +143,7 @@ def setup_run_environment(self, run_env):
         # Cleaup.
         sanitize_environments(run_env)
 
-    def setup_dependent_build_environment(self, spack_env, dspec):
-        # Ensure we can find plugin libraries.
-        spack_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
-        spack_env.prepend_path("PATH", self.prefix.bin)
-        spack_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
-        spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
-        spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
-
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/larcorealg/package.py b/packages/larcorealg/package.py
@@ -146,7 +146,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)
         run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)

diff --git a/packages/larcoreobj/package.py b/packages/larcoreobj/package.py
@@ -151,7 +151,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)
         run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)

diff --git a/packages/lardata/package.py b/packages/lardata/package.py
@@ -164,7 +164,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/lardataalg/package.py b/packages/lardataalg/package.py
@@ -158,7 +158,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/lardataobj/package.py b/packages/lardataobj/package.py
@@ -161,7 +161,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/lareventdisplay/package.py b/packages/lareventdisplay/package.py
@@ -142,7 +142,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/larevt/package.py b/packages/larevt/package.py
@@ -142,7 +142,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/larexamples/package.py b/packages/larexamples/package.py
@@ -143,7 +143,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_nvironment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/larg4/package.py b/packages/larg4/package.py
@@ -148,7 +148,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FHICL_FILE_PATH", "{0}/fcl".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/larpandora/package.py b/packages/larpandora/package.py
@@ -164,7 +164,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FW_SEARCH_PATH", "{0}/gdml".format(self.prefix))
         spack_env.append_path("FW_SEARCH_PATH", "{0}/fw".format(self.prefix))
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)

diff --git a/packages/larpandoracontent/package.py b/packages/larpandoracontent/package.py
@@ -114,3 +114,9 @@ def cmake_args(self):
 
     def setup_build_environment(self, env):
         env.set("CETBUILDTOOLS_VERSION", "cetmodules")
+
+    def setup_run_environment(self, run_env):
+        run_env.prepend_path("PATH", self.prefix.bin)
+        run_env.prepend_path("ROOT_INCLUDE_PATH", self.prefix.include)
+        run_env.append_path("CET_PLUGIN_PATH", self.prefix.lib)
+
diff --git a/packages/larreco/package.py b/packages/larreco/package.py
@@ -171,7 +171,7 @@ def setup_dependent_build_environment(self, spack_env, dspec):
         spack_env.append_path("FW_SEARCH_PATH", "{0}/fw".format(self.prefix))
         sanitize_environments(spack_env)
 
-    def setup_dependent_run_environment(self, run_env, dspec):
+    def setup_run_environment(self, run_env):
         # Ensure we can find plugin libraries.
         run_env.prepend_path("CET_PLUGIN_PATH", self.prefix.lib)
         run_env.prepend_path("PATH", self.prefix.bin)