From 4ae8242fb8473ea1d68d88814cd0435e499ab9b0 Mon Sep 17 00:00:00 2001 From: Kate Date: Fri, 18 Jul 2025 16:28:13 +0100 Subject: [PATCH] ocamlPackages.patch: 2.0.0 -> 3.0.0 ocamlPackages.ray{lib,gui}: fix with patch 3.0.0 --- pkgs/development/ocaml-modules/patch/default.nix | 6 +++--- pkgs/development/ocaml-modules/raylib/default.nix | 13 +++++++++++++ pkgs/development/ocaml-modules/raylib/raygui.nix | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/patch/default.nix b/pkgs/development/ocaml-modules/patch/default.nix index 2615b3d3e4ac..bb64547e9cc3 100644 --- a/pkgs/development/ocaml-modules/patch/default.nix +++ b/pkgs/development/ocaml-modules/patch/default.nix @@ -9,15 +9,15 @@ buildDunePackage rec { pname = "patch"; - version = "2.0.0"; + version = "3.0.0"; - minimalOCamlVersion = "4.03"; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "hannesm"; repo = "patch"; tag = "v${version}"; - hash = "sha256-xqcUZaKlbyXF2//MbCom7/pGA2ej6KHYI3rizXwoqTY="; + hash = "sha256-WIleUxfGp8cvQHYAyRRI6S/MSP4u0BbEyAqlRxCb/To="; }; checkInputs = [ diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix index e6fbe711e7da..17708d871d2c 100644 --- a/pkgs/development/ocaml-modules/raylib/default.nix +++ b/pkgs/development/ocaml-modules/raylib/default.nix @@ -1,6 +1,7 @@ { lib, fetchurl, + fetchpatch, buildDunePackage, dune-configurator, ctypes, @@ -23,6 +24,18 @@ buildDunePackage rec { hash = "sha256-/SeKgQOrhsAgMNk6ODAZlopL0mL0lVfCTx1ugmV1P/s="; }; + patches = [ + (fetchpatch { + name = "fix-build-with-patch-3.0.0.patch"; + url = "https://github.com/tjammer/raylib-ocaml/commit/40e6fef44e3c39d4526806c4b830da77c4fe4bb8.patch"; + excludes = [ + "dune-project" + "raygui.opam" + ]; + hash = "sha256-MEZkkBgjL2iT6Av/s0tJCrW7+oyp9QD6sUbXEusCAWI="; + }) + ]; + buildInputs = [ dune-configurator patch diff --git a/pkgs/development/ocaml-modules/raylib/raygui.nix b/pkgs/development/ocaml-modules/raylib/raygui.nix index f4971b1b1e37..8f10576eae89 100644 --- a/pkgs/development/ocaml-modules/raylib/raygui.nix +++ b/pkgs/development/ocaml-modules/raylib/raygui.nix @@ -13,6 +13,8 @@ buildDunePackage rec { hash = "sha256-PQcVTAQKeTPkOOHk5w3O3Tz0n7jLvkIo3Urvrk66eMs="; }; + inherit (raylib) patches; + propagatedBuildInputs = [ raylib ];