From 7358f42d72bece62855e1e92b856b062c1f5c453 Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Mon, 11 May 2026 22:10:44 -0400
Subject: [PATCH 1/4] mpsolve: build on darwin

---
 pkgs/by-name/mp/mpsolve/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mp/mpsolve/package.nix b/pkgs/by-name/mp/mpsolve/package.nix
index 26df426393cc..441b33a32478 100644
--- a/pkgs/by-name/mp/mpsolve/package.nix
+++ b/pkgs/by-name/mp/mpsolve/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   bison,
   flex,
@@ -23,6 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-BGXvNxWUbto0yMIpEIxZ9wOYv9w0ev4OgVcniNYIKoU=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "include-cmath-in-c++-before-defining-isnan-macro.patch";
+      url = "https://github.com/robol/MPSolve/commit/260432c9d1002261f60159d0520af7862d4471ed.patch";
+      hash = "sha256-ODWpp966S1SsSN8hf7yuYgJR44GgbLwSxui280WWGmM=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     bison
@@ -45,6 +54,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ kilianar ];
     mainProgram = "mpsolve";
-    platforms = lib.platforms.linux;
   };
 })

From 53ca91192698b36bf978c4901b55bb9e8de7ea08 Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Mon, 11 May 2026 17:40:35 -0400
Subject: [PATCH 2/4] mpsolve: various improvements

---
 pkgs/by-name/mp/mpsolve/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/mp/mpsolve/package.nix b/pkgs/by-name/mp/mpsolve/package.nix
index 441b33a32478..1ea5a0888f5d 100644
--- a/pkgs/by-name/mp/mpsolve/package.nix
+++ b/pkgs/by-name/mp/mpsolve/package.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "mpsolve";
   version = "3.2.2";
 
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
   src = fetchFromGitHub {
     owner = "robol";
     repo = "MPSolve";
@@ -32,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     autoreconfHook
     bison
@@ -46,6 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.qtbase
   ];
 
+  enableParallelBuilding = true;
+
   passthru.updateScript = gitUpdater { };
 
   meta = {

From 14d90bda744de71c888c5d2eca62543ce97ed7ba Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Mon, 11 May 2026 15:19:50 -0400
Subject: [PATCH 3/4] mpsolve: run checks

---
 pkgs/by-name/mp/mpsolve/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/mp/mpsolve/package.nix b/pkgs/by-name/mp/mpsolve/package.nix
index 1ea5a0888f5d..13a1e9ea8576 100644
--- a/pkgs/by-name/mp/mpsolve/package.nix
+++ b/pkgs/by-name/mp/mpsolve/package.nix
@@ -5,6 +5,7 @@
   fetchpatch,
   autoreconfHook,
   bison,
+  check,
   flex,
   gitUpdater,
   gmp,
@@ -56,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+
+  checkInputs = [ check ];
+
+  checkTarget = "check";
+
   passthru.updateScript = gitUpdater { };
 
   meta = {

From 8e03d5e6b5a0e49eaa2955abe43b40eb54f6f39b Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Sun, 10 May 2026 19:48:05 -0400
Subject: [PATCH 4/4] mpsolve: make GUI optional

---
 pkgs/by-name/mp/mpsolve/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/mp/mpsolve/package.nix b/pkgs/by-name/mp/mpsolve/package.nix
index 13a1e9ea8576..91ac76c40fa8 100644
--- a/pkgs/by-name/mp/mpsolve/package.nix
+++ b/pkgs/by-name/mp/mpsolve/package.nix
@@ -12,6 +12,8 @@
   gtk3,
   pkg-config,
   libsForQt5,
+
+  withGUI ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -46,15 +48,24 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     pkg-config
+  ]
+  ++ lib.optionals withGUI [
     libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     gmp
+  ]
+  ++ lib.optionals withGUI [
     gtk3
     libsForQt5.qtbase
   ];
 
+  configureFlags = [
+    (lib.enableFeature withGUI "graphical-debugger")
+    (lib.enableFeature withGUI "ui")
+  ];
+
   enableParallelBuilding = true;
 
   doCheck = true;