File tree Expand file tree Collapse file tree 1 file changed +9
-3
lines changed
pkgs/development/r-modules Expand file tree Collapse file tree 1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change 950950 pkgs . pcre2
951951 ] ;
952952 redux = [ pkgs . pkg-config ] ;
953+ s2 = [ pkgs . pkg-config ] ;
953954 rswipl = with pkgs ; [
954955 cmake
955956 pkg-config
@@ -1190,7 +1191,10 @@ let
11901191 tfevents = [ pkgs . protobuf ] ;
11911192 rsvg = [ pkgs . librsvg . dev ] ;
11921193 ssh = with pkgs ; [ libssh ] ;
1193- s2 = [ pkgs . openssl . dev ] ;
1194+ s2 = with pkgs ; [
1195+ abseil-cpp
1196+ openssl . dev
1197+ ] ;
11941198 ArrayExpressHTS = with pkgs ; [
11951199 zlib . dev
11961200 curl . dev
@@ -2127,8 +2131,10 @@ let
21272131 } ) ;
21282132
21292133 s2 = old . s2 . overrideAttrs ( attrs : {
2130- PKGCONFIG_CFLAGS = "-I${ pkgs . openssl . dev } /include" ;
2131- PKGCONFIG_LIBS = "-Wl,-rpath,${ lib . getLib pkgs . openssl } /lib -L${ lib . getLib pkgs . openssl } /lib -lssl -lcrypto" ;
2134+ preConfigure = ''
2135+ substituteInPlace "configure" \
2136+ --replace-fail "absl_s2" "absl_flags absl_check"
2137+ '' ;
21322138 } ) ;
21332139
21342140 Rmpi = old . Rmpi . overrideAttrs ( attrs : {
You can’t perform that action at this time.
0 commit comments