Merge pull request #107 from veprbl/pr/dd4hep_01_27_01

dd4hep: 01-27 -> 01-27-01
veprbl · Nov 23, 2023 · a3977e2 · a3977e2
2 parents 6ecfad1 + 1c84ef2
commit a3977e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 61 deletions.
diff --git a/flake.lock b/flake.lock
diff --git 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
@@ -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 $<TARGET_FILE_DIR:''${library}>:$<TARGET_FILE_DIR:DD4hep::DD4hepGaudiPluginMgr>)' \
-      'set(''${ENV_VAR}_VALUE $<TARGET_FILE_DIR:''${library}>:$<TARGET_FILE_DIR:DD4hep::DD4hepGaudiPluginMgr>:''$ENV{''${ENV_VAR}})'
   '';
 
   nativeBuildInputs = [

diff --git a/pkgs/dd4hep/hexgrid_fix.patch b/pkgs/dd4hep/hexgrid_fix.patch