mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-16 17:14:00 +00:00
parent
6fb6d826d8
commit
3530975ed2
@ -37,7 +37,7 @@
|
|||||||
, nlohmann_json
|
, nlohmann_json
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, procps
|
, procps
|
||||||
, python
|
, python3
|
||||||
, which
|
, which
|
||||||
, xxHash
|
, xxHash
|
||||||
, zlib
|
, zlib
|
||||||
@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
|
|||||||
patchRcPathCsh
|
patchRcPathCsh
|
||||||
patchRcPathFish
|
patchRcPathFish
|
||||||
patchRcPathPosix
|
patchRcPathPosix
|
||||||
python.pkgs.numpy
|
python3.pkgs.numpy
|
||||||
tbb
|
tbb
|
||||||
xrootd
|
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}";
|
pythonVersion = with lib.versions; "${major python.version}${minor python.version}";
|
||||||
withPython = python != null;
|
withPython = python != null;
|
||||||
# ensure that root is built with the same python interpreter, as it links against numpy
|
# 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
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
|
@ -18249,12 +18249,6 @@ with pkgs;
|
|||||||
|
|
||||||
ns-3 = callPackage ../development/libraries/science/networking/ns-3 { python = python3; };
|
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 {
|
rink = callPackage ../applications/science/misc/rink {
|
||||||
inherit (darwin.apple_sdk.frameworks) Security;
|
inherit (darwin.apple_sdk.frameworks) Security;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user