Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grégoire Locqueville
haskell-gargantext
Commits
a30917da
Commit
a30917da
authored
1 year ago
by
Alfredo Di Napoli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix cabal build on Mac
parent
c0957869
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
pkgs.nix
nix/pkgs.nix
+15
-2
No files found.
nix/pkgs.nix
View file @
a30917da
...
...
@@ -2,7 +2,20 @@
rec
{
inherit
pkgs
;
ghc
=
pkgs
.
haskell
.
compiler
.
ghc8107
;
# If we are on a Mac, in order to build successfully with cabal we need a bit more work.
ghc
=
if
pkgs
.
stdenv
.
isDarwin
then
haskell1
.
compiler
.
ghc8107
.
overrideAttrs
(
finalAttrs
:
previousAttrs
:
{
# See https://github.com/NixOS/nixpkgs/pull/149942/files
patches
=
previousAttrs
.
patches
++
[
# Reverts the linking behavior of GHC to not resolve `-libc++` to `c++`.
(
pkgs
.
fetchpatch
{
url
=
"https://raw.githubusercontent.com/input-output-hk/haskell.nix/613ec38dbd62ab7929178c9c7ffff71df9bb86be/overlays/patches/ghc/ghc-macOS-loadArchive-fix.patch"
;
sha256
=
"0IUpuzjZb1G+gP3q6RnwQbW4mFzc/OZ/7QqZy+57kx0="
;
})
];
});
else
pkgs
.
haskell
.
compiler
.
ghc8107
;
}
)
;
haskell1
=
pkgs
.
haskell
//
{
packages
=
pkgs
.
haskell
.
packages
//
{
ghc8107
=
pkgs
.
haskell
.
packages
.
ghc8107
.
override
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment