diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-01-03 17:12:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 17:12:13 -0500 |
| commit | 93d3561b5741ffe3ec197b7f1950a86343d0e7b6 (patch) | |
| tree | 98a2000e06d3200d41fa7db5d6d76f640154c340 | |
| parent | c1497cac7209ffae2799a35b6bd28cfd0d690e84 (diff) | |
| parent | 35462db2e3c09edc4b0222f901771d8138de2a0e (diff) | |
| download | nixlib-93d3561b5741ffe3ec197b7f1950a86343d0e7b6.tar nixlib-93d3561b5741ffe3ec197b7f1950a86343d0e7b6.tar.gz nixlib-93d3561b5741ffe3ec197b7f1950a86343d0e7b6.tar.bz2 nixlib-93d3561b5741ffe3ec197b7f1950a86343d0e7b6.tar.lz nixlib-93d3561b5741ffe3ec197b7f1950a86343d0e7b6.tar.xz nixlib-93d3561b5741ffe3ec197b7f1950a86343d0e7b6.tar.zst nixlib-93d3561b5741ffe3ec197b7f1950a86343d0e7b6.zip | |
Merge pull request #33393 from bnikolic/boostconfigurepythonfix
Correct boost configure phase when enablePython is false
| -rw-r--r-- | pkgs/development/libraries/boost/generic.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 6ea7dba0cb10..c2a59431ac04 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -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} |