From 4e63062e76a9be5c73cff8cf144ace24fa01eace Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 9 Mar 2025 19:00:28 +0100
Subject: [PATCH 1/2] bviplus: fix build with gcc14

---
 pkgs/by-name/bv/bviplus/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/bv/bviplus/package.nix b/pkgs/by-name/bv/bviplus/package.nix
index d322b27c7598..e6c299d3846b 100644
--- a/pkgs/by-name/bv/bviplus/package.nix
+++ b/pkgs/by-name/bv/bviplus/package.nix
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
 
   buildFlags = [ "CFLAGS=-fgnu89-inline" ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-int";
+
   meta = with lib; {
     description = "Ncurses based hex editor with a vim-like interface";
     homepage = "https://bviplus.sourceforge.net";

From f8af8e962fc8639a8872ba621d3c69aec62a9170 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 9 Mar 2025 19:04:38 +0100
Subject: [PATCH 2/2] bviplus: modernize

---
 pkgs/by-name/bv/bviplus/package.nix | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/bv/bviplus/package.nix b/pkgs/by-name/bv/bviplus/package.nix
index e6c299d3846b..bc4abeeb671d 100644
--- a/pkgs/by-name/bv/bviplus/package.nix
+++ b/pkgs/by-name/bv/bviplus/package.nix
@@ -6,13 +6,13 @@
   ncurses,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bviplus";
   version = "1.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
-    sha256 = "08q2fdyiirabbsp5qpn3v8jxp4gd85l776w6gqvrbjwqa29a8arg";
+    url = "mirror://sourceforge/project/bviplus/bviplus/${finalAttrs.version}/bviplus-${finalAttrs.version}.tgz";
+    hash = "sha256-LyukklCYy5U3foabc2hB7ZHbJdrDXlyuXkvlGH1zAiM=";
   };
 
   patches = [
@@ -21,28 +21,24 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       name = "ncurses-6.3.patch";
       url = "https://sourceforge.net/p/bviplus/bugs/7/attachment/bviplus-ncurses-6.2.patch";
-      sha256 = "1g3s2fdly3qliy67f3dlb12a03a21zkjbya6gap4mqxhyyjbp46x";
+      hash = "sha256-3ZC7pPew40quekb5JecPQg2gRFi0DXeMjxQPT5sTerw=";
       # svn patch, rely on prefix added by fetchpatch:
       extraPrefix = "";
     })
   ];
 
-  buildInputs = [
-    ncurses
-  ];
+  buildInputs = [ ncurses ];
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  buildFlags = [ "CFLAGS=-fgnu89-inline" ];
+  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-int -fgnu89-inline";
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-int";
-
-  meta = with lib; {
+  meta = {
     description = "Ncurses based hex editor with a vim-like interface";
     homepage = "https://bviplus.sourceforge.net";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
     mainProgram = "bviplus";
   };
-}
+})