bin/nixenvironment in nixenvironment-0.0.18 vs bin/nixenvironment in nixenvironment-0.0.19

@@ -316,10 +316,14 @@
         build_settings[stripped_key] = stripped_value
       end
     end
   end
 
+  build_settings['CONFIGURATION_BUILD_DIR'] = 'build'
+  build_settings['BUILT_PRODUCTS_DIR'] = 'build'
+  build_settings['DWARF_DSYM_FOLDER_PATH'] = 'build'
+
   return build_settings
 end
 
 def save_build_env_vars(build_settings)
   app_product = "#{build_settings['BUILT_PRODUCTS_DIR']}/#{build_settings['EXECUTABLE_NAME']}.app"
@@ -365,35 +369,45 @@
 def build(build_settings, config, ipa)
   build = File.join(BUILD_SCRIPTS_PATH, 'Build.py')
 
   build_success = nil
 
+  configuration_build_dir = build_settings['CONFIGURATION_BUILD_DIR']
+  dwarf_dsym_folder_path = build_settings['DWARF_DSYM_FOLDER_PATH']
+  built_products_dir = build_settings['BUILT_PRODUCTS_DIR']
+
   if @config['PROJECT_TO_BUILD'] and @config['PROJECT_TO_BUILD'].length > 0
     if @config['PROJECT_TARGET_TO_BUILD'] and @config['PROJECT_TARGET_TO_BUILD'].length > 0
       build_success = system("#{build} --project \"#{@config['PROJECT_TO_BUILD']}\"\
                                        --target \"#{@config['PROJECT_TARGET_TO_BUILD']}\"\
                                        --configuration \"#{config}\"\
                                        --sdk \"#{@config['SDK']}\"\
                                        --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
                                        DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"\
-                                       DWARF_DSYM_FOLDER_PATH=\"#{build_settings['BUILT_PRODUCTS_DIR']}\"")
+                                       DWARF_DSYM_FOLDER_PATH=\"#{dwarf_dsym_folder_path}\"\
+                                       CONFIGURATION_BUILD_DIR=\"#{configuration_build_dir}\"\
+                                       BUILT_PRODUCTS_DIR=\"#{built_products_dir}\"")
     else
       build_success = system("#{build} --project \"#{@config['PROJECT_TO_BUILD']}\"\
                                        --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
                                        --configuration \"#{config}\"\
                                        --sdk \"#{@config['SDK']}\"\
                                        --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
                                        DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"\
-                                       DWARF_DSYM_FOLDER_PATH=\"#{build_settings['BUILT_PRODUCTS_DIR']}\"")
+                                       DWARF_DSYM_FOLDER_PATH=\"#{dwarf_dsym_folder_path}\"\
+                                       CONFIGURATION_BUILD_DIR=\"#{configuration_build_dir}\"\
+                                       BUILT_PRODUCTS_DIR=\"#{built_products_dir}\"")
     end
   elsif @config['WORKSPACE_TO_BUILD'] and @config['WORKSPACE_TO_BUILD'].length > 0
     build_success = system("#{build} --workspace \"#{@config['WORKSPACE_TO_BUILD']}\"\
                                      --scheme \"#{@config['WORKSPACE_SCHEME_TO_BUILD']}\"\
                                      --configuration \"#{config}\"\
                                      --sdk \"#{@config['SDK']}\"\
                                      --env-var-prefix \"#{@config['ENV_VAR_PREFIX']}\"\
                                      DEBUG_INFORMATION_FORMAT=\"dwarf-with-dsym\"\
-                                     DWARF_DSYM_FOLDER_PATH=\"#{build_settings['BUILT_PRODUCTS_DIR']}\"")
+                                     DWARF_DSYM_FOLDER_PATH=\"#{dwarf_dsym_folder_path}\"\
+                                     CONFIGURATION_BUILD_DIR=\"#{configuration_build_dir}\"\
+                                     BUILT_PRODUCTS_DIR=\"#{built_products_dir}\"")
   end
 
   unless build_success
     restore_info_plist
     abort('Build error!')