haskell.compiler: also build manual for cross-compilers
The reasoning given for disabling it is flawed: In most cases, sphinx and its dependencies are already in the binary cache, since we only need them as build tools—sphinx for the build platform is just the normal pkgs.sphinx, since it doesn't care about targetPlatform. We just need to disable it when the buildPlatform is also musl, so we avoid pulling in sphinx in pkgsMusl.
This commit is contained in:
parent
aef2be6c6c
commit
7998143a43
@ -44,12 +44,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -46,12 +46,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pullls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -46,12 +46,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -46,12 +46,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -46,12 +46,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -46,12 +46,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -46,12 +46,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -48,12 +48,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -48,12 +48,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -48,12 +48,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -48,12 +48,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -48,12 +48,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -48,12 +48,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -48,12 +48,9 @@
|
|||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, enableHaddockProgram ?
|
, enableHaddockProgram ?
|
||||||
|
@ -162,13 +162,11 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
, # Whether to build sphinx documentation.
|
, # Whether to build sphinx documentation.
|
||||||
|
# TODO(@sternenseemann): Hadrian ignores the --docs flag if finalStage = Stage1
|
||||||
enableDocs ? (
|
enableDocs ? (
|
||||||
# Docs disabled for musl and cross because it's a large task to keep
|
# Docs disabled if we are building on musl because it's a large task to keep
|
||||||
# all `sphinx` dependencies building in those environments.
|
# all `sphinx` dependencies building in this environment.
|
||||||
# `sphinx` pulls in among others:
|
!stdenv.buildPlatform.isMusl
|
||||||
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
|
|
||||||
(stdenv.targetPlatform == stdenv.hostPlatform)
|
|
||||||
&& !stdenv.hostPlatform.isMusl
|
|
||||||
)
|
)
|
||||||
|
|
||||||
, # Whether to disable the large address space allocator
|
, # Whether to disable the large address space allocator
|
||||||
|
Loading…
Reference in New Issue
Block a user