From fcd0c8318d7484223c88bbfddcc1581522e6fa03 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 23:28:23 +0200
Subject: [PATCH 1/2] linuxPackages.v86d: fix build

---
 pkgs/os-specific/linux/v86d/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
index e6ca1d0e99f8..f9c1ccddb232 100644
--- a/pkgs/os-specific/linux/v86d/default.nix
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation {
     patchShebangs configure
   '';
 
+  # GCC 14 makes this an error by default, remove when fixed upstream
+  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int";
+
   configureFlags = [
     "--with-klibc"
     "--with-x86emu"

From 16dc84994e7450d24acdbfd7e920129f4fb10e83 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 14 May 2025 23:31:16 +0200
Subject: [PATCH 2/2] linuxPackages.v86d: small improvements

- use `tag` in `src`
- specify phase hooks
- remove `with lib;` in `meta`
---
 pkgs/os-specific/linux/v86d/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
index f9c1ccddb232..eb80c0d9cdb7 100644
--- a/pkgs/os-specific/linux/v86d/default.nix
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -16,11 +16,11 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "mjanusz";
     repo = "v86d";
-    rev = "v86d-${pversion}";
+    tag = "v86d-${pversion}";
     hash = "sha256-95LRzVbO/DyddmPwQNNQ290tasCGoQk7FDHlst6LkbA=";
   };
 
-  patchPhase = ''
+  postPatch = ''
     patchShebangs configure
   '';
 
@@ -40,17 +40,21 @@ stdenv.mkDerivation {
   ];
 
   configurePhase = ''
+    runHook preConfigure
+
     ./configure $configureFlags
+
+    runHook postConfigure
   '';
 
   buildInputs = [ klibc ];
 
-  meta = with lib; {
+  meta = {
     description = "Daemon to run x86 code in an emulated environment";
     mainProgram = "v86d";
     homepage = "https://github.com/mjanusz/v86d";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ codyopel ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ codyopel ];
     platforms = [
       "i686-linux"
       "x86_64-linux"