more fixes

Author: anmonteiro

ocaml/revery/reason-harfbuzz.nix

@@ -7,14 +7,17 @@
 , lib
 , libcxx
 , stdenv
+, darwin
 }:
 
 buildDunePackage {
   pname = "reason-harfbuzz";
   version = "0.0.0";
   inherit (reason-sdl2) src;
 
-  buildInputs = [ dune-configurator ];
+  buildInputs = [ dune-configurator ] ++
+    lib.optionals stdenv.isDarwin
+      (with darwin.apple_sdk.frameworks; [ Foundation AppKit ]);
   nativeBuildInputs = [
     reason
     pkg-config

ocaml/revery/reason-skia.nix

@@ -16,34 +16,26 @@ buildDunePackage {
   pname = "reason-skia";
   version = "0.0.0";
   inherit (reason-sdl2) src;
+  # the cptr function was removed from ctypes, so the value now needs to be
+  # destructured to get to the pointer
   postPatch = ''
-    # the cptr function was removed from ctypes, so the value now needs to be
-    # destructured to get to the pointer
     substituteInPlace packages/reason-skia/src/Skia.re \
       --replace "module CI = Cstubs_internals;" \
                 "module CI = { include Cstubs_internals; let cptr = (CPointer(a)) => a; };"
-    #substituteInPlace packages/reason-skia/src/wrapped/bindings/SkiaWrappedBindings.re \
-    #packages/reason-skia/src/Skia.re \
-    #  --replace "module CI = Cstubs_internals;" \
-    #            "module CI = { include Cstubs_internals; let cptr = (CPointer(a)) => a; };"
   '';
-  buildInputs = [
-    dune-configurator
-  ];
-  nativeBuildInputs = [
-    reason
-    pkg-config
-  ];
-  propagatedBuildInputs = [
-    darwin.apple_sdk.frameworks.AppKit
-    darwin.apple_sdk.frameworks.Cocoa
-    darwin.apple_sdk.frameworks.ForceFeedback
+
+  nativeBuildInputs = [ reason pkg-config ];
+  buildInputs = [ dune-configurator ];
+  propagatedBuildInputs = with darwin.apple_sdk.frameworks; [
+    AppKit
+    Cocoa
+    ForceFeedback
     libiconv
     reason-sdl2
     ctypes
   ];
   SDL2_INCLUDE_PATH = "${SDL2.dev}/include";
-  SDL2_LIB_PATH = ''${(SDL2.override { withStatic = true; }).out}/lib'';
+  SDL2_LIB_PATH = "${SDL2.override { withStatic = true; }}/lib";
   SKIA_INCLUDE_PATH = "${esy-skia}/include/c";
   SKIA_LIB_PATH = "${esy-skia}/out/Release";
   JPEG_LIB_PATH = "${(libjpeg.override { enableStatic = true; }).out}/lib";

overlay/default.nix

@@ -161,15 +161,13 @@ in
 
     stdenv.mkDerivation rec {
       name = "skia";
-      patches = [
-        ../ocaml/revery/patches/0002-esy-skia-use-libtool.patch
-      ];
       src = fetchFromGitHub {
         owner = "revery-ui";
         repo = "esy-skia";
         rev = "29349b9279ed24a73ec41acd7082caea9bd8c04e";
         sha256 = "sha256-VyY1clAdTEZu0cFy/+Bw19OQ4lb55s4gIV/7TsFKdnk=";
       };
+
       nativeBuildInputs = with self; [
         gn
         ninja
@@ -185,18 +183,14 @@ in
         darwin.apple_sdk.frameworks.OpenGL
         # TODO handle ios, android
         #-framework CoreServices -framework CoreGraphics -framework CoreText -framework CoreFoundation
-        stdenv.cc
-        # needed to get libtool - TODO: double check this, add darwin flag, test on linux if ar is needed
-        darwin.cctools
       ];
 
       preConfigure = ''
         mkdir -p third_party/externals
         ln -s ${angle2} third_party/externals/angle2
         ln -s ${piex} third_party/externals/piex
       '';
-      #TODO: remove cc= ccx=
-      #TODO: optional xcode_sysroot
+
       #TODO: built this based on feature flags, with sane defaults per os
       #TODO: enable more features
       configurePhase = ''