From 2db5d487f15c28528f23d4004e98fa88efdf588f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 7 Nov 2025 13:49:25 -0500 Subject: [PATCH] root: allow overriding clang and clad_src via finalAttrs --- pkgs/by-name/ro/root/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index c432784847e3..4d681421a1fc 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -50,7 +50,7 @@ xrootd, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "root"; version = "6.36.04"; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; + url = "https://root.cern.ch/download/root_v${finalAttrs.version}.source.tar.gz"; hash = "sha256-zGNn2PVjxtSco0wJ0LU8sPQaUo22+GrxEf12dEzaRZY="; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { nlohmann_json # link interface of target "ROOT::ROOTEve" ]; buildInputs = [ - clang + finalAttrs.clang davix fftw ftgl @@ -161,8 +161,8 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCLAD_SOURCE_DIR=${clad_src}" - "-DClang_DIR=${clang}/lib/cmake/clang" + "-DCLAD_SOURCE_DIR=${finalAttrs.clad_src}" + "-DClang_DIR=${finalAttrs.clang}/lib/cmake/clang" "-Dbuiltin_clang=OFF" "-Dbuiltin_llvm=OFF" "-Dfail-on-missing=ON" @@ -258,4 +258,4 @@ stdenv.mkDerivation rec { ]; license = licenses.lgpl21; }; -} +})