diff options
| author | Peter Simons <simons@cryp.to> | 2017-02-26 22:38:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-26 22:38:42 +0100 |
| commit | f2051a61df5f158b719c124829dc973aa77ca127 (patch) | |
| tree | 017f9432762247d5ab573c6aa587b5f8479a74a4 | |
| parent | 7611525c008408be64b99e5b0517820cc578bde8 (diff) | |
| parent | 8beee1ec2d4103452025efca43e4eb84688786bb (diff) | |
Merge pull request #23228 from Gabriel439/gabriel/fix_haskell_gtk
Fix `pkgs.haskellPackages.gtk` build. Fixes #23184
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d9bdf46c0b668..fc0edb9e6f3f8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -689,6 +689,10 @@ self: super: { # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza cairo = addBuildTool super.cairo self.gtk2hs-buildtools; pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; + gtk = + if pkgs.stdenv.isDarwin + then appendConfigureFlag super.gtk "-fhave-quartz-gtk" + else super.gtk; # https://github.com/commercialhaskell/stack/issues/3001 stack = doJailbreak super.stack; |