From 6ab109a6732cf8a8e7335d50f3ee4db95d1568b7 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Wed, 15 Nov 2017 22:46:26 +0000 Subject: [PATCH] rdf4store: fix build with glibc 2.26 Tracking issue: #31696 --- .../http/4store/4store-1.1.6-glibc-2.26.patch | 12 ++++++++++++ pkgs/servers/http/4store/default.nix | 15 ++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/http/4store/4store-1.1.6-glibc-2.26.patch 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 new file mode 100644 index 000000000000..dda21c54f693 --- /dev/null +++ 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 + #include + #define __USE_MISC ++#define __USE_XOPEN_EXTENDED + #include + + #include "filter.h" diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix index 18cfe488f83f..186b0790e4a1 100644 --- 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; };