From f3ca1ba821bf2c313da9e07a6115357e6a782088 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Sun, 22 Feb 2026 05:11:54 +0000 Subject: [PATCH 1/3] hashlink: change mbedtls_2 to mbedtls Hashlink 1.15 compiles fine with mbedtls 3 --- pkgs/by-name/ha/hashlink/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 25bc2b734586..bb880c217bfd 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -10,7 +10,7 @@ libjpeg_turbo, libuv, libvorbis, - mbedtls_2, + mbedtls, openal, pcre, SDL2, @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { libpng libuv libvorbis - mbedtls_2 + mbedtls openal pcre SDL2 From c696ad86bb4cf228fabdd1f5598a1a75bb7d8692 Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Sun, 22 Feb 2026 05:12:51 +0000 Subject: [PATCH 2/3] hashlink: remove unneeded patch This compilation issue was fixed in hashlink 1.15 --- pkgs/by-name/ha/hashlink/package.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index bb880c217bfd..ed3023382bff 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -28,14 +28,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-nVr+fDdna8EEHvIiXsccWFRTYzXfb4GG1zrfL+O6zLA="; }; - # incompatible pointer type error: const char ** -> const void ** - postPatch = '' - substituteInPlace libs/sqlite/sqlite.c \ - --replace-warn \ - "sqlite3_prepare16_v2(db->db, sql, -1, &r->r, &tl)" \ - "sqlite3_prepare16_v2(db->db, sql, -1, &r->r, (const void**)&tl)" - ''; - buildInputs = [ libGL libGLU From 15fbd2d84e55d676c24825766c81296002eef36b Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Wed, 25 Mar 2026 23:27:15 +0000 Subject: [PATCH 3/3] hashlink: backport CMakeLists.txt version fix --- pkgs/by-name/ha/hashlink/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index ed3023382bff..2e0a6a731606 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-nVr+fDdna8EEHvIiXsccWFRTYzXfb4GG1zrfL+O6zLA="; }; + # backport of https://github.com/HaxeFoundation/hashlink/pull/767 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-warn \ + "cmake_minimum_required(VERSION 3.1)" \ + "cmake_minimum_required(VERSION 3.13)" + ''; + buildInputs = [ libGL libGLU