From a70af477b19cf3874dc8ddfe80dd01cdfe21e5db Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 6 Nov 2024 02:32:58 +0100
Subject: [PATCH 1/3] libfmvoice: 0-unstable-2024-06-06 ->
 0-unstable-2024-11-03

---
 pkgs/by-name/li/libfmvoice/package.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix
index cccc2f512e54..1448e294b68c 100644
--- a/pkgs/by-name/li/libfmvoice/package.nix
+++ b/pkgs/by-name/li/libfmvoice/package.nix
@@ -7,15 +7,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libfmvoice";
-  version = "0-unstable-2024-06-06";
+  version = "0-unstable-2024-11-03";
 
   src = fetchFromGitHub {
     owner = "vampirefrog";
     repo = "libfmvoice";
-    rev = "cd89a6a386b3b17c74b1caca11e297b2748cf90d";
-    hash = "sha256-yak+pKxkrKOX/qgtwpldjd85deE/JB040bVjDD1mo7A=";
+    rev = "c4b069cf633e52d4b7dce6e0b4277a0daa057774";
+    hash = "sha256-ZwqzrQ3kpOAZjJcstovmoNW8bG56w1YXm5ZMYIkjQ9M=";
   };
 
+  outputs = [
+    "out"
+    "bin"
+  ];
+
   strictDeps = true;
 
   enableParallelBuilding = true;
@@ -25,14 +30,21 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildFlags = [
+    "AR=${stdenv.cc.targetPrefix}ar"
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
 
   installPhase = ''
     runHook preInstall
 
-    for prog in $(grep 'PROGS=' Makefile | cut -d'=' -f2); do
-      install -Dm755 $prog $out/bin/$prog
+    install -Dm644 libfmvoice.a $out/lib/libfmvoice.a
+
+    for header in *.h; do
+      install -Dm644 $header $out/include/$header
+    done
+
+    for prog in $(grep 'PROGS:=' Makefile | cut -d'=' -f2); do
+      install -Dm755 $prog $bin/bin/$prog
     done
 
     runHook postInstall

From ecff2204449afc1ced32878fc673808451e61000 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 6 Nov 2024 02:33:33 +0100
Subject: [PATCH 2/3] libfmvoice: nixfmt

---
 pkgs/by-name/li/libfmvoice/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix
index 1448e294b68c..eada99e2e229 100644
--- a/pkgs/by-name/li/libfmvoice/package.nix
+++ b/pkgs/by-name/li/libfmvoice/package.nix
@@ -1,8 +1,9 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, unstableGitUpdater
-, zlib
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,9 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  buildInputs = [
-    zlib
-  ];
+  buildInputs = [ zlib ];
 
   buildFlags = [
     "AR=${stdenv.cc.targetPrefix}ar"

From e90e71b3069d4f05b3dd3221f3f2cc5090a9d45e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 6 Nov 2024 02:34:31 +0100
Subject: [PATCH 3/3] libfmvoice: Drop meta-wide "with lib;"

---
 pkgs/by-name/li/libfmvoice/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libfmvoice/package.nix b/pkgs/by-name/li/libfmvoice/package.nix
index eada99e2e229..7b457400f576 100644
--- a/pkgs/by-name/li/libfmvoice/package.nix
+++ b/pkgs/by-name/li/libfmvoice/package.nix
@@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = unstableGitUpdater { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "C library for loading, saving and converting FM sound chip voice files in various formats";
     homepage = "https://github.com/vampirefrog/libfmvoice";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
   };
 })