haskellPackages.svgcairo: Fix build by correcting cpp options

There's an open pull request that fixes the build but it's been sitting there
for a while, the fix is in a single commit so just applying the commit as a
patch. This will also allow us to fix ghc-vis later.
main
Deniz Alp 3 years ago
parent 287bb04efb
commit afd1e21fe4
  1. 6
      pkgs/development/haskell-modules/configuration-common.nix
  2. 1
      pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
  3. 2
      pkgs/development/haskell-modules/hackage-packages.nix

@ -1250,6 +1250,12 @@ self: super: {
gi-cairo-render = doJailbreak super.gi-cairo-render;
gi-cairo-connector = doJailbreak super.gi-cairo-connector;
# Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged.
svgcairo = appendPatch super.svgcairo (pkgs.fetchpatch {
url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch";
sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh";
});
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104
massiv = dontCheck super.massiv;

@ -4621,7 +4621,6 @@ broken-packages:
- SVD2HS
- svfactor
- svg-builder-fork
- svgcairo
- svgutils
- svm-light-utils
- svm-simple

@ -257179,8 +257179,6 @@ self: {
libraryPkgconfigDepends = [ librsvg ];
description = "Binding to the libsvg-cairo library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {inherit (pkgs) librsvg;};
"svgone" = callPackage

Loading…
Cancel
Save