From 9ce3c8c33d86dcd325a459a702787c05a4ef3d47 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 23 Jan 2024 01:33:33 +0100
Subject: f3d: unbreak with autoPatchelfHook

(cherry picked from commit eaf845cf05cbbda06bc94866feb3db4e053638fd)
---
 pkgs/applications/graphics/f3d/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index 0207d3fa13e0c..7cfd8030189ed 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -1,4 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, vtk_9
+, autoPatchelfHook
+, libX11
+, libGL
+, Cocoa
+, OpenGL
+}:
 
 stdenv.mkDerivation rec {
   pname = "f3d";
@@ -11,7 +21,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-3Pg8uvrUGPKPmsn24q5HPMg9dgvukAXBgSVTW0NiCME=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    # https://github.com/f3d-app/f3d/pull/1217
+    autoPatchelfHook
+  ];
 
   buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
 
-- 
cgit 1.4.1


From 5b407fd459b9d81c5612dda54f91652418d5f3d5 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 23 Jan 2024 02:08:41 +0100
Subject: f3d: build manpage

(cherry picked from commit e5970be7e321f05c34dacf62353c26e27f93955d)
---
 pkgs/applications/graphics/f3d/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index 7cfd8030189ed..38b829659ba8c 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -2,6 +2,8 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, help2man
+, gzip
 , vtk_9
 , autoPatchelfHook
 , libX11
@@ -14,6 +16,8 @@ stdenv.mkDerivation rec {
   pname = "f3d";
   version = "2.2.1";
 
+  outputs = [ "out" "man" ];
+
   src = fetchFromGitHub {
     owner = "f3d-app";
     repo = "f3d";
@@ -23,18 +27,22 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
+    help2man
+    gzip
     # https://github.com/f3d-app/f3d/pull/1217
     autoPatchelfHook
   ];
 
   buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ];
 
-  # conflict between VTK and Nixpkgs;
-  # see https://github.com/NixOS/nixpkgs/issues/89167
   cmakeFlags = [
+    # conflict between VTK and Nixpkgs;
+    # see https://github.com/NixOS/nixpkgs/issues/89167
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_BINDIR=bin"
+
+    "-DF3D_LINUX_GENERATE_MAN=ON"
   ];
 
   meta = with lib; {
-- 
cgit 1.4.1


From 6b5429f4dbf98bea1d008935c19d29c09cf3bd1b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 23 Jan 2024 02:08:54 +0100
Subject: f3d.meta.maintainers: add pbsds

(cherry picked from commit ce77b53f1a812aca689056e8c25a58479fdd0cb7)
---
 pkgs/applications/graphics/f3d/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index 38b829659ba8c..6d78c28ace779 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = "https://f3d-app.github.io/f3d";
     changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ bcdarwin ];
+    maintainers = with maintainers; [ bcdarwin pbsds ];
     platforms = with platforms; unix;
   };
 }
-- 
cgit 1.4.1


From 91be93281c7c60f0ed3498538ddc3180e47835c4 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 23 Jan 2024 02:09:37 +0100
Subject: f3d: 2.2.1 -> 2.3.0

Diff: https://github.com/f3d-app/f3d/compare/refs/tags/v2.2.1...v2.3.0

Changelog: https://github.com/f3d-app/f3d/releases/tag/v2.3.0
(cherry picked from commit d5e11b7d9a8303fe2e49e2ef042791e7db7ae823)
---
 pkgs/applications/graphics/f3d/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/applications/graphics')

diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix
index 6d78c28ace779..2fef95222b5a5 100644
--- a/pkgs/applications/graphics/f3d/default.nix
+++ b/pkgs/applications/graphics/f3d/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "f3d";
-  version = "2.2.1";
+  version = "2.3.0";
 
   outputs = [ "out" "man" ];
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "f3d-app";
     repo = "f3d";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3Pg8uvrUGPKPmsn24q5HPMg9dgvukAXBgSVTW0NiCME=";
+    hash = "sha256-pr2xuCy5yoUuj2cjkTh3Xwpg3g7zBspjErEi5luRD6Y=";
   };
 
   nativeBuildInputs = [
-- 
cgit 1.4.1