Merge pull request #111 from veprbl/pr/root_with_webgui

root: build with root7=ON and webgui=ON
veprbl · Dec 13, 2023 · bdf43fa · bdf43fa
2 parents 617f647 + aa4a4ec
commit bdf43fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/overlay.nix b/overlay.nix
@@ -119,10 +119,12 @@ final: prev: with final; {
       "-Dbuiltin_unuran=ON"
       "-Dpythia6=ON" # for fun4all
       "-Dunuran=ON" # for sartre
+      "-Droot7=ON" "-Dwebgui=ON" "-Dbuiltin_openui5=ON" # ROOT::ROOTGeomViewer for dd4hep
     ] ++ final.lib.optionals final.stdenv.isDarwin [
       # https://github.com/AIDASoft/podio/issues/367
       "-Dimt=OFF"
     ];
+    preConfigure = builtins.replaceStrings [ "rm -rf builtins/*" ] [ "" ] prev.preConfigure;
     buildInputs  = prev.buildInputs ++ [
       openssl
       pythia6

diff --git a/pkgs/dd4hep/default.nix b/pkgs/dd4hep/default.nix
@@ -28,9 +28,6 @@ stdenv.mkDerivation rec {
 
     substituteInPlace cmake/thisdd4hep.sh \
       --replace "grep" "${gnugrep}/bin/grep"
-
-    substituteInPlace DDCore/CMakeLists.txt \
-      --replace "ROOT::ROOTHistDraw" ""
   '' + lib.optionalString stdenv.isDarwin ''
     substituteInPlace cmake/DD4hepBuild.cmake \
       --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "" \