diff --git a/flake.lock b/flake.lock index c9e8792..f78bd04 100644 --- a/flake.lock +++ b/flake.lock @@ -37,16 +37,16 @@ "dd4hep-src": { "flake": false, "locked": { - "lastModified": 1698160069, - "narHash": "sha256-vROAG965klhuqQOipddVxRwSVdMI9c7a0zmEKPsNmQs=", + "lastModified": 1700579447, + "narHash": "sha256-GUt5Cdm/Bl74mNJxVdfhgO+jFDWcycfqxPEmfWtl9PE=", "owner": "AIDASoft", "repo": "DD4hep", - "rev": "ff4c726c90084b378cd9dc413ae2114e829002a7", + "rev": "04bb629ddab5344c8df69070c35573f2f8095c69", "type": "github" }, "original": { "owner": "AIDASoft", - "ref": "v01-27", + "ref": "v01-27-01", "repo": "DD4hep", "type": "github" } diff --git a/flake.nix b/flake.nix index 7d73cb5..fa8c20a 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ flake = false; }; inputs.dd4hep-src = { - url = "github:AIDASoft/DD4hep/v01-27"; + url = "github:AIDASoft/DD4hep/v01-27-01"; flake = false; }; inputs.edm4eic-src = { diff --git a/pkgs/dd4hep/default.nix b/pkgs/dd4hep/default.nix index e7ed91c..aa91a59 100644 --- a/pkgs/dd4hep/default.nix +++ b/pkgs/dd4hep/default.nix @@ -19,14 +19,10 @@ stdenv.mkDerivation rec { pname = "DD4hep"; - version = "01-27.${dd4hep-src.shortRev or "dirty"}"; + version = "01-27-01.${dd4hep-src.shortRev or "dirty"}"; src = dd4hep-src; - patches = [ - ./hexgrid_fix.patch - ]; - postPatch = '' patchShebangs --host . @@ -35,19 +31,11 @@ stdenv.mkDerivation rec { substituteInPlace DDCore/CMakeLists.txt \ --replace "ROOT::ROOTHistDraw" "" - - substituteInPlace DDG4/edm4hep/Geant4Output2EDM4hep.cpp \ - --replace "setValues" "setValue" \ - --replace "hits = m_calorimeterHits[colName] = edm4hep::SimTrackerHitCollection()" "hits = m_calorimeterHits[colName]" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/DD4hepBuild.cmake \ --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "" \ --replace 'set(CMAKE_INSTALL_RPATH "@loader_path/../lib")' "" \ --replace 'SET(Python_FIND_FRAMEWORK LAST)' 'set(Python_FIND_FRAMEWORK NEVER)' - substituteInPlace cmake/DD4hep.cmake \ - --replace \ - 'set(''${ENV_VAR}_VALUE $:$)' \ - 'set(''${ENV_VAR}_VALUE $:$:''$ENV{''${ENV_VAR}})' ''; nativeBuildInputs = [ diff --git a/pkgs/dd4hep/hexgrid_fix.patch b/pkgs/dd4hep/hexgrid_fix.patch deleted file mode 100644 index fd41b88..0000000 --- a/pkgs/dd4hep/hexgrid_fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/DDCore/src/plugins/ReadoutSegmentations.cpp b/DDCore/src/plugins/ReadoutSegmentations.cpp -index 7462e7d9..578c3bfb 100644 ---- a/DDCore/src/plugins/ReadoutSegmentations.cpp -+++ b/DDCore/src/plugins/ReadoutSegmentations.cpp -@@ -40,6 +40,9 @@ DECLARE_SEGMENTATION(CartesianGridYZ,create_segmentation) - -+#include "DDSegmentation/CartesianGridXYStaggered.h" -+DECLARE_SEGMENTATION(CartesianGridXYStaggered,dd4hep::create_segmentation) -+ - #include "DDSegmentation/CartesianStripX.h" - DECLARE_SEGMENTATION(CartesianStripX,create_segmentation) - -@@ -75,3 +78,6 @@ DECLARE_SEGMENTATION(ProjectiveCylinder,create_segmentation) -+ -+#include "DDSegmentation/HexGrid.h" -+DECLARE_SEGMENTATION(HexGrid,create_segmentation) -diff --git a/DDCore/src/segmentations/CartesianGridXYStaggered.cpp b/DDCore/src/segmentations/CartesianGridXYStaggered.cpp -index 871958ff..69cf7723 100644 ---- a/DDCore/src/segmentations/CartesianGridXYStaggered.cpp -+++ b/DDCore/src/segmentations/CartesianGridXYStaggered.cpp -@@ -96,7 +96,3 @@ std::vector CartesianGridXYStaggered::cellDimensions(const CellID& cellI - - } /* namespace DDSegmentation */ - } /* namespace dd4hep */ -- --// This is done DDCore/src/plugins/ReadoutSegmentations.cpp so the plugin is not part of libDDCore --// needs also #include "DD4hep/Factories.h" --// DECLARE_SEGMENTATION(CartesianGridXYStaggered,dd4hep::create_segmentation) -diff --git a/DDCore/src/segmentations/HexGrid.cpp b/DDCore/src/segmentations/HexGrid.cpp -index f051a8f6..0e9224e5 100644 ---- a/DDCore/src/segmentations/HexGrid.cpp -+++ b/DDCore/src/segmentations/HexGrid.cpp -@@ -145,5 +145,3 @@ namespace dd4hep { - - } /* namespace DDSegmentation */ - } /* namespace dd4hep */ -- --DECLARE_SEGMENTATION(HexGrid, create_segmentation)