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

haskell-pango: patch to fix the build

Browse Source
This commit is contained in:
Peter Simons 2019-10-06 12:42:08 +02:00
parent fba182f944
commit 63faef32e6
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -691,13 +691,8 @@ self: super: {
# We get lots of strange compiler errors during the test suite run. # We get lots of strange compiler errors during the test suite run.
jsaddle = dontCheck super.jsaddle; jsaddle = dontCheck super.jsaddle;
# Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza # Enable have-quartz-gtk flag on Darwin.
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; gtk = if pkgs.stdenv.isDarwin then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk;
pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
gtk =
if pkgs.stdenv.isDarwin
then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
else super.gtk;
# https://github.com/Philonous/hs-stun/pull/1 # https://github.com/Philonous/hs-stun/pull/1
# Remove if a version > 0.1.0.1 ever gets released. # Remove if a version > 0.1.0.1 ever gets released.
@ -1230,10 +1225,15 @@ self: super: {
# https://github.com/gtk2hs/gtk2hs/issues/276 # https://github.com/gtk2hs/gtk2hs/issues/276
glib = appendPatch super.glib (pkgs.fetchpatch { glib = appendPatch super.glib (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282.patch; url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/4bb428e144ef2de9390f0f2239dcc50b7fc9a259.patch;
name = "undefine-gcc-attribute-syntax";
sha256 = "1s72s683p2n5ri1a030zywciq0020ms64cmsy48axndp6dp9vri7"; sha256 = "1s72s683p2n5ri1a030zywciq0020ms64cmsy48axndp6dp9vri7";
stripLen = 1; stripLen = 1;
}); });
# https://github.com/gtk2hs/gtk2hs/issues/276
pango = appendPatch super.pango (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/0a6016e89ce98415bb395ca0cfafeaacf3b3fce6.patch;
sha256 = "1n9spriinyif4h1h9mfj9k87b80kcs39qlym5yxnxxg0yszqqcpc";
stripLen = 1;
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

6
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -605,4 +605,10 @@ self: super: builtins.intersectAttrs super {
hadolint = overrideCabal super.hadolint (drv: { hadolint = overrideCabal super.hadolint (drv: {
preConfigure = "sed -i -e /ld-options:/d hadolint.cabal"; preConfigure = "sed -i -e /ld-options:/d hadolint.cabal";
}); });
# gtk2hs-buildtools is listed in setupHaskellDepends, but we
# need it during the build itself, too.
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
pango = disableHardening (addBuildTool super.pango self.buildHaskellPackages.gtk2hs-buildtools) ["fortify"];
} }