Merge pull request #139465 from dalpd/fix-svgcairo

haskellPackages.svgcairo: Fix build by correcting cpp options
2021-09-25 23:59:12 +02:00
parent fac07c2b92 afd1e21fe4
commit 8b6b0a39b6
3 changed files with 6 additions and 3 deletions
@@ -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