JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of boost is used

Browse Source 
Also fix one incorrect output in geant.
This commit is contained in:
Tuomas Tynkkynen 2016-08-23 04:02:52 +03:00
parent e9bf11b039
commit a18ee4acb7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/webthree-umbrella/default.nix
View File

@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
]);
configurePhase = ''
export BOOST_INCLUDEDIR=${boost}/include
export BOOST_INCLUDEDIR=${boost.dev}/include
export BOOST_LIBRARYDIR=${boost.out}/lib
mkdir -p Build/Install

4
pkgs/development/libraries/physics/geant4/g4py/default.nix
View File

@ -30,8 +30,8 @@ let
--with-g4install-dir=${geant4} \
--with-python-incdir=${python}/include/python${python.majorVersion} \
--with-python-libdir=${python}/lib \
--with-boost-incdir=${boost}/include \
--with-boost-libdir=${boost}/lib
--with-boost-incdir=${boost.dev}/include \
--with-boost-libdir=${boost.out}/lib
'';
enableParallelBuilding = true;

2
pkgs/development/libraries/science/math/clblas/cuda/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';
configurePhase = ''
findInputs ${boost} boost_dirs propagated-native-build-inputs
findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib

2
pkgs/development/python-modules/pycuda/default.nix
View File

@ -30,7 +30,7 @@ buildPythonPackage rec {
};
preConfigure = ''
findInputs ${boost} boost_dirs propagated-native-build-inputs
findInputs ${boost.dev} boost_dirs propagated-native-build-inputs
export BOOST_INCLUDEDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep '\-dev')/include
export BOOST_LIBRARYDIR=$(echo $boost_dirs | sed -e s/\ /\\n/g - | grep -v '\-dev')/lib