rdf4store: fix build with glibc 2.26

Tracking issue: #31696
NixOS · Nov 15, 2017 · 6ab109a · 6ab109a
1 parent 958d603
commit 6ab109a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/pkgs/servers/http/4store/4store-1.1.6-glibc-2.26.patch b/pkgs/servers/http/4store/4store-1.1.6-glibc-2.26.patch
@@ -0,0 +1,12 @@
+diff --git a/src/frontend/filter-datatypes.c b/src/frontend/filter-datatypes.c
+index 8aae1dd..49ed358 100644
+--- a/src/frontend/filter-datatypes.c
++++ b/src/frontend/filter-datatypes.c
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <math.h>
+ #define __USE_MISC
++#define __USE_XOPEN_EXTENDED
+ #include <time.h>
+
+ #include "filter.h"
diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
@@ -11,15 +11,18 @@ stdenv.mkDerivation rec {
   version = "1.1.6";
 
   src = fetchFromGitHub {
-    owner = "garlik";
+    owner = "4store";
     repo = "4store";
     rev = "v${version}";
     sha256 = "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk";
   };
 
+  patches = [ ./4store-1.1.6-glibc-2.26.patch ];
+
+  nativeBuildInputs = [ autoreconfHook perl pkgconfig which ];
+
   buildInputs = [ librdf_raptor librdf_rasqal glib libxml2 pcre
-    avahi readline ncurses expat zlib pkgconfig which perl libuuid
-    gmp mpfr autoreconfHook ];
+    avahi readline ncurses expat zlib libuuid gmp mpfr ];
 
   # needed for ./autogen.sh
   prePatch = ''
@@ -29,15 +32,17 @@ stdenv.mkDerivation rec {
   preConfigure =  ''
     sed -e 's@#! */bin/bash@#! ${stdenv.shell}@' -i configure
     find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';'
-    
+
     rm src/utilities/4s-backend 
     sed -e 's@/var/lib/4store@${db_dir}@g' -i configure.ac src/utilities/*
     sed -e '/FS_STORE_ROOT/d' -i src/utilities/Makefile*
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "SparQL query server (RDF storage)";
-    homepage = http://4store.org/;
+    homepage = https://4store.danielknoell.de/;
     maintainers = with maintainers; [ raskin ];
     platforms = platforms.linux;
   };