Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a2921a656d05
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 945eabed4087
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 6, 2019

  1. haskell-pango: patch to fix the build

    @peti
    peti committed Oct 6, 2019
    Copy the full SHA
    945eabe View commit details
Showing with 15 additions and 9 deletions.
  1. +9 −9 pkgs/development/haskell-modules/configuration-common.nix
  2. +6 −0 pkgs/development/haskell-modules/configuration-nix.nix
18 changes: 9 additions & 9 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -691,13 +691,8 @@ self: super: {
# We get lots of strange compiler errors during the test suite run.
jsaddle = dontCheck super.jsaddle;

# Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools;
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;
# Enable have-quartz-gtk flag on Darwin.
gtk = if pkgs.stdenv.isDarwin then appendConfigureFlag super.gtk "-fhave-quartz-gtk" else super.gtk;

# https://github.com/Philonous/hs-stun/pull/1
# Remove if a version > 0.1.0.1 ever gets released.
@@ -1230,10 +1225,15 @@ self: super: {

# https://github.com/gtk2hs/gtk2hs/issues/276
glib = appendPatch super.glib (pkgs.fetchpatch {
url = https://github.com/gtk2hs/gtk2hs/pull/282.patch;
name = "undefine-gcc-attribute-syntax";
url = https://github.com/gtk2hs/gtk2hs/pull/282/commits/4bb428e144ef2de9390f0f2239dcc50b7fc9a259.patch;
sha256 = "1s72s683p2n5ri1a030zywciq0020ms64cmsy48axndp6dp9vri7";
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
6 changes: 6 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -600,4 +600,10 @@ self: super: builtins.intersectAttrs super {
hadolint = overrideCabal super.hadolint (drv: {
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"];

}