From 9c0c6b382654ccd479cb50b2d6e997cfdd0ba8fa Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13+github@gmail.com>
Date: Wed, 30 Jul 2025 14:46:47 +0200
Subject: [PATCH 1/3] wasilibc: 22-unstable-2024-10-26 ->
 27-unstable-2025-07-27

Update the wasilibc to the current release.

Signed-off-by: wucke13 <wucke13+github@gmail.com>
---
 pkgs/by-name/wa/wasilibc/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 4ec6324d61c1..54dbd7d0a139 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "wasilibc";
-  version = "22-unstable-2024-10-16";
+  version = "27-unstable-2025-07-27";
 in
 stdenvNoLibc.mkDerivation {
   inherit pname version;
@@ -16,8 +16,8 @@ stdenvNoLibc.mkDerivation {
   src = buildPackages.fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wasi-libc";
-    rev = "98897e29fcfc81e2b12e487e4154ac99188330c4";
-    hash = "sha256-NFKhMJj/quvN3mR7lmxzA9w46KhX92iG0rQA9qDeS8I=";
+    rev = "3f7eb4c7d6ede4dde3c4bffa6ed14e8d656fe93f";
+    hash = "sha256-RIjph1XdYc1aGywKks5JApcLajbNFEuWm+Wy/GMHddg=";
     fetchSubmodules = true;
   };
 
@@ -31,6 +31,7 @@ stdenvNoLibc.mkDerivation {
   postPatch = ''
     substituteInPlace Makefile \
       --replace "-Werror" ""
+    patchShebangs scripts/
   '';
 
   preBuild = ''

From d8603c74deac7e0a7a9b4d202dd30ae91a136810 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13+github@gmail.com>
Date: Wed, 30 Jul 2025 14:49:16 +0200
Subject: [PATCH 2/3] wasilibc: refactor and clean up the package

- remove unused import
- remove unnecessary `let .. in` binding
  - it is unclear to me what the benefit of this binding was, likely a
    remnant from more elaborate src fetching in the past
- replace `buildPackages.fetchFromGitHub` by just `fetchFromGitHub`
  - it is unclear to me why manual splicing would be needed here
- remove old fix from previous version
  - The bugreport was initially for version 16, the last activity in it
    mentions version 20 of the sdk, we are now at version 27
- add myself as maintainer

Co-authored-by: applePrincess <appleprincess@appleprincess.io>
Signed-off-by: wucke13 <wucke13+github@gmail.com>
---
 pkgs/by-name/wa/wasilibc/package.nix | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 54dbd7d0a139..91747c477733 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -1,22 +1,19 @@
 {
   stdenvNoLibc,
-  buildPackages,
+  fetchFromGitHub,
   lib,
   firefox-unwrapped,
   firefox-esr-unwrapped,
 }:
 
-let
+stdenvNoLibc.mkDerivation (finalAttrs: {
   pname = "wasilibc";
-  version = "27-unstable-2025-07-27";
-in
-stdenvNoLibc.mkDerivation {
-  inherit pname version;
+  version = "27";
 
-  src = buildPackages.fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "wasi-libc";
-    rev = "3f7eb4c7d6ede4dde3c4bffa6ed14e8d656fe93f";
+    tag = "wasi-sdk-${finalAttrs.version}";
     hash = "sha256-RIjph1XdYc1aGywKks5JApcLajbNFEuWm+Wy/GMHddg=";
     fetchSubmodules = true;
   };
@@ -43,10 +40,7 @@ stdenvNoLibc.mkDerivation {
       "SYSROOT_LIB:=$SYSROOT_LIB"
       "SYSROOT_INC:=$SYSROOT_INC"
       "SYSROOT_SHARE:=$SYSROOT_SHARE"
-      # https://bugzilla.mozilla.org/show_bug.cgi?id=1773200
-      "BULK_MEMORY_SOURCES:="
     )
-
   '';
 
   enableParallelBuilding = true;
@@ -63,13 +57,14 @@ stdenvNoLibc.mkDerivation {
   };
 
   meta = with lib; {
-    changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${version}";
+    changelog = "https://github.com/WebAssembly/wasi-sdk/releases/tag/wasi-sdk-${finalAttrs.version}";
     description = "WASI libc implementation for WebAssembly";
     homepage = "https://wasi.dev";
     platforms = platforms.wasi;
     maintainers = with maintainers; [
       matthewbauer
       rvolosatovs
+      wucke13
     ];
     license = with licenses; [
       asl20
@@ -77,4 +72,4 @@ stdenvNoLibc.mkDerivation {
       mit
     ];
   };
-}
+})

From 6a4aac01d9b272341ace89c1da27cc219f56d407 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13+github@gmail.com>
Date: Wed, 30 Jul 2025 15:05:46 +0200
Subject: [PATCH 3/3] wasilibc: enable posix thread-model via opt-in arg

Signed-off-by: wucke13 <wucke13+github@gmail.com>
---
 pkgs/by-name/wa/wasilibc/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index 91747c477733..9b58b0ca2f05 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -4,6 +4,7 @@
   lib,
   firefox-unwrapped,
   firefox-esr-unwrapped,
+  enablePosixThreads ? false,
 }:
 
 stdenvNoLibc.mkDerivation (finalAttrs: {
@@ -40,6 +41,7 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
       "SYSROOT_LIB:=$SYSROOT_LIB"
       "SYSROOT_INC:=$SYSROOT_INC"
       "SYSROOT_SHARE:=$SYSROOT_SHARE"
+      ${lib.strings.optionalString enablePosixThreads "THREAD_MODEL:=posix"}
     )
   '';