From a18ee4acb70ccbee454139392acf468f2810e5f1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 23 Aug 2016 04:02:52 +0300
Subject: [PATCH] treewide: Make explicit that 'dev' output of boost is used

Also fix one incorrect output in geant.
---
 pkgs/applications/misc/webthree-umbrella/default.nix          | 2 +-
 pkgs/development/libraries/physics/geant4/g4py/default.nix    | 4 ++--
 .../libraries/science/math/clblas/cuda/default.nix            | 2 +-
 pkgs/development/python-modules/pycuda/default.nix            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/webthree-umbrella/default.nix b/pkgs/applications/misc/webthree-umbrella/default.nix
index 3bf3142ad9c..6ada451edf1 100644
--- a/pkgs/applications/misc/webthree-umbrella/default.nix
+++ b/pkgs/applications/misc/webthree-umbrella/default.nix
@@ -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
diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix
index e023b122091..ea4163eaecf 100644
--- a/pkgs/development/libraries/physics/geant4/g4py/default.nix
+++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix
@@ -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;
diff --git a/pkgs/development/libraries/science/math/clblas/cuda/default.nix b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
index 0b5a3323ec1..c142514b262 100644
--- a/pkgs/development/libraries/science/math/clblas/cuda/default.nix
+++ b/pkgs/development/libraries/science/math/clblas/cuda/default.nix
@@ -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
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index c8be20bbe0a..d97a23746fd 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -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