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

Merge pull request #33393 from bnikolic/boostconfigurepythonfix

Browse Source 
Correct boost configure phase when enablePython is false
This commit is contained in:
John Ericson 2018-01-03 17:12:13 -05:00 committed by GitHub
commit 93d3561b57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/boost/generic.nix
View File

@ -125,9 +125,9 @@ stdenv.mkDerivation {
configureFlags = [
"--includedir=$(dev)/include"
"--libdir=$(out)/lib"
(if enablePython then "--with-python=${python.interpreter}" else "--without-python")
(if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu")
] ++ optional (toolset != null) "--with-toolset=${toolset}";
] ++ optional enablePython "--with-python=${python.interpreter}"
++ [ (if hostPlatform == buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ]
++ optional (toolset != null) "--with-toolset=${toolset}";
buildPhase = ''
./b2 ${b2Args}