diff options
| author | K900 <me@0upti.me> | 2024-01-02 10:55:23 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-01-02 10:55:23 +0300 |
| commit | 887e96e875e933c0a5d203ffc40e202f3d16317e (patch) | |
| tree | 07c2de06c350dc5e330f71aa79796368ae5e2179 /pkgs/development/compilers/ghc/9.4.5.nix | |
| parent | 494bdb470881cb8714b47a0bbb0048157e8fdeda (diff) | |
| parent | 6786065ebd23800c6673fe80a5c97d3ec9e439d6 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/development/compilers/ghc/9.4.5.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/9.4.5.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/compilers/ghc/9.4.5.nix b/pkgs/development/compilers/ghc/9.4.5.nix index 522eab95794f3..9670d4a4fd574 100644 --- a/pkgs/development/compilers/ghc/9.4.5.nix +++ b/pkgs/development/compilers/ghc/9.4.5.nix @@ -48,12 +48,9 @@ , # Whether to build sphinx documentation. enableDocs ? ( - # Docs disabled for musl and cross because it's a large task to keep - # all `sphinx` dependencies building in those environments. - # `sphinx` pulls in among others: - # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. - (stdenv.targetPlatform == stdenv.hostPlatform) - && !stdenv.hostPlatform.isMusl + # Docs disabled if we are building on musl because it's a large task to keep + # all `sphinx` dependencies building in this environment. + !stdenv.buildPlatform.isMusl ) , enableHaddockProgram ? @@ -215,7 +212,7 @@ stdenv.mkDerivation (rec { # These cause problems as they're not eliminated by GHC's dead code # elimination on aarch64-darwin. (see # https://github.com/NixOS/nixpkgs/issues/140774 for details). - ./Cabal-3.6-3.8-paths-fix-cycle-aarch64-darwin.patch + ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch ]; postPatch = "patchShebangs ."; |