From 6624665d664aeb1b90008689110722bdc4b2e928 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 Jun 2023 18:41:39 -0500
Subject: [PATCH] [Backport releases/v0.20] dd4hep: B-field fix patch (#485)

# Description
Backport of #484 to `releases/v0.20`.

---------

Co-authored-by: Wouter Deconinck <wdconinc@gmail.com>
---
 packages/dd4hep/package.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/dd4hep/package.py b/packages/dd4hep/package.py
index fcda6079..50641646 100644
--- a/packages/dd4hep/package.py
+++ b/packages/dd4hep/package.py
@@ -40,6 +40,19 @@ class Dd4hep(BuiltinDd4hep):
         sha256="73932633e95272f77c1f6ad8edf06d426b198c30a9c9467167c04f3a3f7f5d12",
         when="@1.25.1",
     )
+    patch(
+        "https://github.com/AIDASoft/DD4hep/pull/1080.patch?full_index=1",
+        sha256="2dde47795f8534fcbfb9454b3b729a5a758e2dc90b6bd9f5f8bdc8940e2da0f7",
+        when="@1.25.1",
+    )
+    @when('@1.25.1')
+    def setup_run_environment(self, env):
+        super().setup_run_environment(env)
+        env.set("CXXFLAGS", "-DDD4HEP_FIELD_TYPE_OVERRIDE=field_type")
+    @when('@1.25.1')
+    def setup_dependent_build_environment(self, env, dependent_spec):
+        super().setup_dependent_build_environment(env, dependent_spec)
+        env.set("CXXFLAGS", "-DDD4HEP_FIELD_TYPE_OVERRIDE=field_type")
     patch(
         "https://github.com/AIDASoft/DD4hep/commit/8693a29669d03dec5e06b61e6df7cc0df1e0aa5c.patch",
         sha256="28fb1c17eb1c06c24b304511308fd3b0af708f2ba3aec3e4cb13d7da6abbc51c",