From 437c2d7e6b964f53d70f234dbc34fe6f56bd40e9 Mon Sep 17 00:00:00 2001
From: Ali Abrar <aliabrar@gmail.com>
Date: Tue, 9 Jul 2019 19:30:25 -0400
Subject: [PATCH] Fix jsaddle-webkit2gtk crash

See https://github.com/ghcjs/jsaddle/issues/85
---
 haskell-overlays/reflex-packages/default.nix         | 12 ++++++------
 .../reflex-packages/dep/jsaddle/github.json          |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/haskell-overlays/reflex-packages/default.nix b/haskell-overlays/reflex-packages/default.nix
index d710200c3..f0b7f9817 100644
--- a/haskell-overlays/reflex-packages/default.nix
+++ b/haskell-overlays/reflex-packages/default.nix
@@ -45,11 +45,11 @@ in
   ## GHCJS and JSaddle
   ##
 
-  jsaddle = self.callCabal2nix "jsaddle" "${jsaddleSrc}/jsaddle" {};
-  jsaddle-clib = self.callCabal2nix "jsaddle-clib" "${jsaddleSrc}/jsaddle-clib" {};
-  jsaddle-webkit2gtk = self.callCabal2nix "jsaddle-webkit2gtk" "${jsaddleSrc}/jsaddle-webkit2gtk" {};
-  jsaddle-webkitgtk = self.callCabal2nix "jsaddle-webkitgtk" "${jsaddleSrc}/jsaddle-webkitgtk" {};
-  jsaddle-wkwebview = overrideCabal (self.callCabal2nix "jsaddle-wkwebview" "${jsaddleSrc}/jsaddle-wkwebview" {}) (drv: {
+  jsaddle = self.callCabal2nix "jsaddle" (jsaddleSrc + /jsaddle) {};
+  jsaddle-clib = self.callCabal2nix "jsaddle-clib" (jsaddleSrc + /jsaddle-clib) {};
+  jsaddle-webkit2gtk = self.callCabal2nix "jsaddle-webkit2gtk" (jsaddleSrc + /jsaddle-webkit2gtk) {};
+  jsaddle-webkitgtk = self.callCabal2nix "jsaddle-webkitgtk" (jsaddleSrc + /jsaddle-webkitgtk) {};
+  jsaddle-wkwebview = overrideCabal (self.callCabal2nix "jsaddle-wkwebview" (jsaddleSrc + /jsaddle-wkwebview) {}) (drv: {
     # HACK(matthewbauer): Can’t figure out why cf-private framework is
     #                     not getting pulled in correctly. Has something
     #                     to with how headers are looked up in xcode.
@@ -71,7 +71,7 @@ in
   # another broken test
   # phantomjs has issues with finding the right port
   # jsaddle-warp = dontCheck (addTestToolDepend (self.callCabal2nix "jsaddle-warp" "${jsaddleSrc}/jsaddle-warp" {}));
-  jsaddle-warp = dontCheck (self.callCabal2nix "jsaddle-warp" "${jsaddleSrc}/jsaddle-warp" {});
+  jsaddle-warp = dontCheck (self.callCabal2nix "jsaddle-warp" (jsaddleSrc + /jsaddle-warp) {});
 
   jsaddle-dom = self.callPackage self._dep.jsaddle-dom {};
   inherit (ghcjsDom) ghcjs-dom-jsffi;
diff --git a/haskell-overlays/reflex-packages/dep/jsaddle/github.json b/haskell-overlays/reflex-packages/dep/jsaddle/github.json
index 2c5f29074..11b36e222 100644
--- a/haskell-overlays/reflex-packages/dep/jsaddle/github.json
+++ b/haskell-overlays/reflex-packages/dep/jsaddle/github.json
@@ -1,6 +1,6 @@
 {
-  "owner": "ghcjs",
+  "owner": "obsidiansystems",
   "repo": "jsaddle",
-  "rev": "c745863b2d5b50980c64b326295ed625cfae53c1",
-  "sha256": "0adqz72g6pr1pcg7306by5f1vkbii6jgv8lr7q57qz7azllmg5ns"
+  "rev": "a74c9fcd35e4ef58c8abb40ff7d85b5d5d4686f7",
+  "sha256": "0yazwiz8rzf5xiqcaaiapwlp0132h97azvd9vgdy6zgr3j4snh03"
 }