mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 22:43:01 +00:00
root: move to by-name
This commit is contained in:
parent
48bcebe361
commit
adea5468dc
@ -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
|
||||
]
|
19
pkgs/by-name/ro/root5/setup-hook.sh
Normal file
19
pkgs/by-name/ro/root5/setup-hook.sh
Normal 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
|
@ -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 {
|
||||
|
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user