From aa4a4ecb81a51376287fd6b3c9d724adb79c10b3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 4 Dec 2023 20:11:16 -0500 Subject: [PATCH] root: build with root7=ON and webgui=ON --- overlay.nix | 2 ++ pkgs/dd4hep/default.nix | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/overlay.nix b/overlay.nix index 959d325..b757025 100644 --- 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 index aa91a59..448101f 100644 --- 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")' "" \