Unverified Commit 4b7e20a7 authored by Justin Bedő's avatar Justin Bedő Committed by GitHub
Browse files

Merge pull request #304916 from Kupac/fix_rgoslin 

rPackages.rgoslin: fix build
parents 97270181 2684333c

pkgs/development/r-modules/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -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}"

pkgs/development/r-modules/patches/rgoslin.patch

0 → 100644
+12 −0
Original line number Diff line number Diff line 
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())