g4py: fix for new boost
This commit is contained in:
parent
f3049d020a
commit
fc4f99a8dd
@ -11,6 +11,7 @@
|
|||||||
let
|
let
|
||||||
# g4py does not support MT and will fail to build against MT geant
|
# g4py does not support MT and will fail to build against MT geant
|
||||||
geant4_nomt = geant4.override { enableMultiThreading = false; };
|
geant4_nomt = geant4.override { enableMultiThreading = false; };
|
||||||
|
boost_python = boost.override { enablePython = true; inherit python; };
|
||||||
in
|
in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -20,10 +21,20 @@ stdenv.mkDerivation rec {
|
|||||||
sourceRoot = "geant4.10.04.p01/environments/g4py";
|
sourceRoot = "geant4.10.04.p01/environments/g4py";
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [ geant4_nomt xercesc boost python ];
|
buildInputs = [ geant4_nomt xercesc boost_python python ];
|
||||||
|
|
||||||
GEANT4_INSTALL = geant4_nomt;
|
GEANT4_INSTALL = geant4_nomt;
|
||||||
|
|
||||||
|
preConfigure = ''
|
||||||
|
# Fix for boost 1.67+
|
||||||
|
substituteInPlace CMakeLists.txt \
|
||||||
|
--replace "find_package(Boost)" "find_package(Boost 1.40 REQUIRED COMPONENTS python${builtins.replaceStrings ["."] [""] python.majorVersion})"
|
||||||
|
for f in `find . -name CMakeLists.txt`; do
|
||||||
|
substituteInPlace "$f" \
|
||||||
|
--replace "boost_python" "\''${Boost_LIBRARIES}"
|
||||||
|
done
|
||||||
|
'';
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
setupHook = ./setup-hook.sh;
|
setupHook = ./setup-hook.sh;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user