Merge pull request #304916 from Kupac/fix_rgoslin

rPackages.rgoslin: fix build
This commit is contained in:
Justin Bedő 2024-04-20 13:57:00 +10:00 committed by GitHub
commit 4b7e20a7ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 0 deletions

View File

@ -1353,6 +1353,10 @@ let
'';
});
rgoslin = old.rgoslin.overrideAttrs (attrs: {
patches = [ ./patches/rgoslin.patch ];
});
rpanel = old.rpanel.overrideAttrs (attrs: {
preConfigure = ''
export TCLLIBPATH="${pkgs.bwidget}/lib/bwidget${pkgs.bwidget.version}"

View File

@ -0,0 +1,12 @@
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 <algorithm>
#include <cctype>
+#include <cstdint>
#define contains_val(X, Y) ((X).find(Y) != (X).end())