From 87b7ca36899d7cacaa3531c62423c15f500e404c Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Mon, 30 Sep 2024 20:40:53 +0800
Subject: [PATCH] fix build

---
 modules/services/{xray/default.nix => xray.nix} |  4 ----
 modules/services/xray/disable-splice.patch      | 14 --------------
 packages/default.nix                            |  1 -
 packages/matplotplusplus.nix                    | 15 +++------------
 4 files changed, 3 insertions(+), 31 deletions(-)
 rename modules/services/{xray/default.nix => xray.nix} (98%)
 delete mode 100644 modules/services/xray/disable-splice.patch

diff --git a/modules/services/xray/default.nix b/modules/services/xray.nix
similarity index 98%
rename from modules/services/xray/default.nix
rename to modules/services/xray.nix
index 15a04f9d..e267d2b2 100644
--- a/modules/services/xray/default.nix
+++ b/modules/services/xray.nix
@@ -56,8 +56,6 @@ inputs:
           {
             enable = true;
             settingsFile = inputs.config.sops.templates."xray-client.json".path;
-            package = inputs.pkgs.xray.overrideAttrs
-              (prev: { patches = prev.patches or [] ++ [ ./disable-splice.patch ];});
           };
           dnsmasq =
           {
@@ -347,8 +345,6 @@ inputs:
         {
           enable = true;
           settingsFile = inputs.config.sops.templates."xray-server.json".path;
-          package = inputs.pkgs.xray.overrideAttrs
-            (prev: { patches = prev.patches or [] ++ [ ./disable-splice.patch ];});
         };
         sops =
         {
diff --git a/modules/services/xray/disable-splice.patch b/modules/services/xray/disable-splice.patch
deleted file mode 100644
index acd35218..00000000
--- a/modules/services/xray/disable-splice.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/proxy/proxy.go b/proxy/proxy.go
-index db92051..54d36b4 100644
---- a/proxy/proxy.go
-+++ b/proxy/proxy.go
-@@ -504,7 +504,8 @@ func CopyRawConnIfExist(ctx context.Context, readerConn net.Conn, writerConn net
- 				splice = false
- 			}
- 		}
--		if splice {
-+		_ = splice
-+		if false {
- 			newError("CopyRawConn splice").WriteToLog(session.ExportIDToError(ctx))
- 			statWriter, _ := writer.(*dispatcher.SizeStatWriter)
- 			//runtime.Gosched() // necessary
diff --git a/packages/default.nix b/packages/default.nix
index e9fad053..f4777c98 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -11,7 +11,6 @@ inputs: rec
   nodesoup = inputs.pkgs.callPackage ./nodesoup.nix { src = inputs.topInputs.nodesoup; };
   matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix
   {
-    inherit glad nodesoup;
     src = inputs.topInputs.matplotplusplus;
     stdenv = inputs.pkgs.clang18Stdenv;
   };
diff --git a/packages/matplotplusplus.nix b/packages/matplotplusplus.nix
index 31963aea..ead05f63 100644
--- a/packages/matplotplusplus.nix
+++ b/packages/matplotplusplus.nix
@@ -1,18 +1,9 @@
 {
-  stdenv, src, cmake, pkg-config, substituteAll,
-  gnuplot, libjpeg, libtiff, zlib, libpng, lapack, blas, fftw, opencv, nodesoup, cimg, glfw, libGL, python3, glad
+  stdenv, src, cmake, pkg-config, substituteAll
 }: stdenv.mkDerivation
 {
   name = "matplotplusplus";
   inherit src;
-  cmakeFlags =
-  [
-    "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF"
-    "-DMATPLOTPP_WITH_SYSTEM_NODESOUP=ON" "-DMATPLOTPP_WITH_SYSTEM_CIMG=ON"
-    "-DMATPLOTPP_BUILD_EXPERIMENTAL_OPENGL_BACKEND=ON" "-DGLAD_REPRODUCIBLE=ON"
-  ];
-  buildInputs = [ gnuplot libjpeg libtiff zlib libpng lapack blas fftw opencv nodesoup cimg glfw libGL glad ];
-  nativeBuildInputs = [ cmake pkg-config python3 ];
-  propagatedBuildInputs = [ libGL glad glfw ];
-  propagatedNativeBuildInputs = [ python3 ];
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DMATPLOTPP_BUILD_EXAMPLES=OFF" ];
+  nativeBuildInputs = [ cmake pkg-config ];
 }