From 1c84ef27bb2cb9bcec5aa9af19a809835a8ebd4c Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Nov 2023 02:26:44 -0500 Subject: [PATCH] dd4hep: remove outdated substitutions --- pkgs/dd4hep/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/dd4hep/default.nix b/pkgs/dd4hep/default.nix index 8ab5819..aa91a59 100644 --- a/pkgs/dd4hep/default.nix +++ b/pkgs/dd4hep/default.nix @@ -31,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 = [