public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23228 from Gabriel439/gabriel/fix_haskell_gtk 

Fix `pkgs.haskellPackages.gtk` build.  Fixes #23184
This commit is contained in:
Peter Simons 2017-02-26 22:38:42 +01:00 committed by GitHub
parent 7611525c00 8beee1ec2d
commit f2051a61df
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -689,6 +689,10 @@ self: super: {
# Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
cairo = addBuildTool super.cairo self.gtk2hs-buildtools; cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; 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 # https://github.com/commercialhaskell/stack/issues/3001
stack = doJailbreak super.stack; stack = doJailbreak super.stack;