From 68a9012606146432c03bd0ed2f864ba6723c552d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= Date: Sun, 2 Jun 2024 23:16:14 +0200 Subject: [PATCH] rPackages.rgoslin: fix build - Remove unnecessary patch - Disable parallel building, removes header file before it's used --- pkgs/development/r-modules/default.nix | 2 +- pkgs/development/r-modules/patches/rgoslin.patch | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 pkgs/development/r-modules/patches/rgoslin.patch diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index eddf60b43c71..1b6d8b49d137 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1489,7 +1489,7 @@ let }); rgoslin = old.rgoslin.overrideAttrs (attrs: { - patches = [ ./patches/rgoslin.patch ]; + enableParallelBuilding = false; }); rpanel = old.rpanel.overrideAttrs (attrs: { diff --git a/pkgs/development/r-modules/patches/rgoslin.patch b/pkgs/development/r-modules/patches/rgoslin.patch deleted file mode 100644 index 4e17b69b383f..000000000000 --- a/pkgs/development/r-modules/patches/rgoslin.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/cppgoslin/cppgoslin/domain/StringFunctions.h b/src/cppgoslin/cppgoslin/domain/StringFunctions.h -index 70e8544..de5c040 100644 ---- a/src/cppgoslin/cppgoslin/domain/StringFunctions.h -+++ b/src/cppgoslin/cppgoslin/domain/StringFunctions.h -@@ -35,6 +35,7 @@ SOFTWARE. - #include "cppgoslin/domain/Element.h" - #include - #include -+#include - - - #define contains_val(X, Y) ((X).find(Y) != (X).end())