Pulling changes from pinot-noir-gcc to pinot-noir

stacks/pinot-noir/packages_stack.yaml

@@ -6,9 +6,6 @@ packages:
       jpeg: [libjpeg]
       zlib-api: [zlib-ng]
     require:
-      - spec: "^libiconv"
-        when: "^iconv"
-
       - spec: '+ipo'
         when: '%gcc'
 
@@ -133,9 +130,6 @@ packages:
     require:
     - spec: '+rdmacm +rc +dc +ud +cma +verbs'
 
-  zlib-ng:
-    require: ['build_system=autotools']
-
   # ----------------------------------------------------------------------------
   # System dependencies
   # ----------------------------------------------------------------------------

stacks/pinot-noir/spack.yaml

@@ -6,6 +6,7 @@ spack:
       - packages_env.yaml
 
       - modules_stack.yaml
+      - modules_env.yaml
 
       - definitions_env.yaml