diff options
| author | Bojan Nikolic <bojan@bnikolic.co.uk> | 2018-01-03 19:26:16 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-03 16:57:49 -0500 |
| commit | 35462db2e3c09edc4b0222f901771d8138de2a0e (patch) | |
| tree | 088ccc1883e50738025baf2b377c9fb8c8971eec /pkgs/development/libraries/boost | |
| parent | 5e31e828f88a8aa229d68bade00d9f2d70f7b9f8 (diff) | |
| download | nixpkgs-35462db2e3c09edc4b0222f901771d8138de2a0e.tar nixpkgs-35462db2e3c09edc4b0222f901771d8138de2a0e.tar.gz nixpkgs-35462db2e3c09edc4b0222f901771d8138de2a0e.tar.bz2 nixpkgs-35462db2e3c09edc4b0222f901771d8138de2a0e.tar.lz nixpkgs-35462db2e3c09edc4b0222f901771d8138de2a0e.tar.xz nixpkgs-35462db2e3c09edc4b0222f901771d8138de2a0e.tar.zst nixpkgs-35462db2e3c09edc4b0222f901771d8138de2a0e.zip | |
Correct boost configure phase when enablePython is false
The bootstrap script does not seem to have --without-python; instead just omit --with-python option
Diffstat (limited to 'pkgs/development/libraries/boost')
| -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 6ea7dba0cb1..c2a59431ac0 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} |