root: move to by-name

This commit is contained in:
Dmitry Kalinkin 2024-11-14 14:37:17 -05:00
parent 48bcebe361
commit adea5468dc
13 changed files with 22 additions and 9 deletions

View File

@ -37,7 +37,7 @@
, nlohmann_json
, pkg-config
, procps
, python
, python3
, which
, xxHash
, zlib
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
patchRcPathCsh
patchRcPathFish
patchRcPathPosix
python.pkgs.numpy
python3.pkgs.numpy
tbb
xrootd
]

View File

@ -0,0 +1,19 @@
thisroot () {
# Workaround thisroot.sh dependency on man
if [ -z "${MANPATH-}" ]; then
MANPATH=:
fi
local oldOpts="-u"
shopt -qo nounset || oldOpts="+u"
set +u
source @out@/bin/thisroot.sh
set "$oldOpts"
}
postHooks+=(thisroot)
addRootIncludePath() {
addToSearchPath ROOT_INCLUDE_PATH $1/include
}
addEnvHooks "$targetOffset" addRootIncludePath

View File

@ -11,7 +11,7 @@ let
pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
withPython = python != null;
# ensure that root is built with the same python interpreter, as it links against numpy
root_py = if withPython then root.override { inherit python; } else root;
root_py = if withPython then root.override { python3 = python; } else root;
in
stdenv.mkDerivation rec {

View File

@ -18234,12 +18234,6 @@ with pkgs;
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
root = callPackage ../applications/science/misc/root {
python = python3;
};
root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix { });
rink = callPackage ../applications/science/misc/rink {
inherit (darwin.apple_sdk.frameworks) Security;
};