From 35462db2e3c09edc4b0222f901771d8138de2a0e Mon Sep 17 00:00:00 2001 From: Bojan Nikolic Date: Wed, 3 Jan 2018 19:26:16 +0000 Subject: [PATCH] Correct boost configure phase when enablePython is false The bootstrap script does not seem to have --without-python; instead just omit --with-python option --- pkgs/development/libraries/boost/generic.nix | 6 +++--- 1 file 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}