From ad7be5bc2b22a47baf34eebb913b93c11482fb37 Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 23 Sep 2023 18:44:19 +0800
Subject: [PATCH] matplotplusplus: fix build

---
 local/pkgs/default.nix                 |  5 +++--
 local/pkgs/matplotplusplus/default.nix | 10 +++++++---
 local/pkgs/nodesoup/default.nix        | 13 +++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 local/pkgs/nodesoup/default.nix

diff --git a/local/pkgs/default.nix b/local/pkgs/default.nix
index a0d78030..c3871560 100644
--- a/local/pkgs/default.nix
+++ b/local/pkgs/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs }: with pkgs;
+{ lib, pkgs }: with pkgs; rec
 {
   typora = callPackage ./typora {};
   upho = python3Packages.callPackage ./upho {};
@@ -27,5 +27,6 @@
   v_sim = callPackage ./v_sim {};
   concurrencpp = callPackage ./concurrencpp { stdenv = gcc13Stdenv; };
   eigengdb = python3Packages.callPackage ./eigengdb {};
-  matplotplusplus = callPackage ./matplotplusplus {};
+  nodesoup = callPackage ./nodesoup {};
+  matplotplusplus = callPackage ./matplotplusplus { inherit nodesoup; };
 }
diff --git a/local/pkgs/matplotplusplus/default.nix b/local/pkgs/matplotplusplus/default.nix
index 37006d29..fc2e07d5 100644
--- a/local/pkgs/matplotplusplus/default.nix
+++ b/local/pkgs/matplotplusplus/default.nix
@@ -1,6 +1,6 @@
 {
   stdenv, fetchFromGitHub, cmake, pkg-config,
-  gnuplot, libjpeg, libtiff, zlib, libpng, lapack, blas, fftw, opencv
+  gnuplot, libjpeg, libtiff, zlib, libpng, lapack, blas, fftw, opencv, nodesoup, cimg
 }: stdenv.mkDerivation rec
 {
   pname = "matplotplusplus";
@@ -12,7 +12,11 @@
     rev = "v${version}";
     sha256 = "mYXAB1AbCtcd2rEuluJN6hDKE9+AowodjJt2pdyntes=";
   };
-  cmakeFlags = [ "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF" ];
-  buildInputs = [ gnuplot libjpeg libtiff zlib libpng lapack blas fftw opencv ];
+  cmakeFlags =
+  [
+    "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF"
+    "-DMATPLOTPP_WITH_SYSTEM_NODESOUP=ON" "-DMATPLOTPP_WITH_SYSTEM_CIMG=ON"
+  ];
+  buildInputs = [ gnuplot libjpeg libtiff zlib libpng lapack blas fftw opencv nodesoup cimg ];
   nativeBuildInputs = [ cmake pkg-config ];
 }
diff --git a/local/pkgs/nodesoup/default.nix b/local/pkgs/nodesoup/default.nix
new file mode 100644
index 00000000..efe2eb7d
--- /dev/null
+++ b/local/pkgs/nodesoup/default.nix
@@ -0,0 +1,13 @@
+{ stdenv, fetchFromGitHub, cmake, pkg-config, cairo, pcre2, xorg }: stdenv.mkDerivation rec
+{
+  name = "nodesoup";
+  src = fetchFromGitHub
+  {
+    owner = "olvb";
+    repo = "nodesoup";
+    rev = "3158ad082bb0cd1abee75418b12b35522dbca74f";
+    sha256 = "tFLq6QC3U3uvcuWsdRy2wnwcmAfH2MkI2oMcAiUBHSo=";
+  };
+  buildInputs = [ cairo pcre2.dev xorg.libXdmcp.dev ];
+  nativeBuildInputs = [ cmake pkg-config ];
+}