g4py: fix after bump to 10.04.1

This commit is contained in:
Dmitry Kalinkin 2018-05-16 17:55:07 -04:00
parent 537de20645
commit 4d33e289b5
2 changed files with 11 additions and 30 deletions

View File

@ -1,12 +0,0 @@
--- environments/g4py/configure 2014-03-17 22:47:05.000000000 +1100
+++ environments/g4py/configure 2014-09-01 15:33:46.523637686 +1000
@@ -4,9 +4,6 @@
# ======================================================================
export LANG=C
-PATH=/bin:/usr/bin
-export PATH
-
# ======================================================================
# testing the echo features
# ======================================================================

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl
{ stdenv, fetchurl, cmake, xercesc
# The target version of Geant4
, geant4
@ -8,30 +8,23 @@
, boost
}:
let
# g4py does not support MT and will fail to build against MT geant
geant4_nomt = geant4.override { enableMultiThreading = false; };
in
stdenv.mkDerivation rec {
inherit (geant4) version src;
inherit (geant4_nomt) version src;
name = "g4py-${version}";
# ./configure overwrites $PATH, which clobbers everything.
patches = [ ./configure.patch ];
patchFlags = "-p0";
sourceRoot = "geant4.10.04.p01/environments/g4py";
configurePhase = ''
export PYTHONPATH=$PYTHONPATH:${geant4}/lib64:$prefix
nativeBuildInputs = [ cmake ];
buildInputs = [ geant4_nomt xercesc boost python ];
source ${geant4}/share/Geant4-*/geant4make/geant4make.sh
cd environments/g4py
./configure linux64 --prefix=$prefix \
--with-g4install-dir=${geant4} \
--with-python-incdir=${python}/include/python${python.majorVersion} \
--with-python-libdir=${python}/lib \
--with-boost-incdir=${boost.dev}/include \
--with-boost-libdir=${boost.out}/lib
'';
GEANT4_INSTALL = geant4_nomt;
enableParallelBuilding = true;
buildInputs = [ geant4 boost python ];
setupHook = ./setup-hook.sh;