From f0a1f7e02627e0e3f402ac55a7f6e112aba24df7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 Jan 2019 10:55:26 +0100
Subject: [PATCH] xbps: fix build with gcc8

---
 pkgs/tools/package-management/xbps/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
index d29b46b87bed..d7b085f4b74e 100644
--- a/pkgs/tools/package-management/xbps/default.nix
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }:
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, which, zlib, openssl, libarchive }:
 
 stdenv.mkDerivation rec {
   name = "xbps-${version}";
@@ -15,7 +15,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib openssl libarchive ];
 
-  patches = [ ./cert-paths.patch ];
+  patches = [
+    ./cert-paths.patch
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/void-linux/xbps/pull/38.patch";
+      sha256 = "050a9chw0cxy67nm2phz67mgndarrxrv50d54m3l1s5sx83axww3";
+    })
+  ];
 
   postPatch = ''
     # fix unprefixed ranlib (needed on cross)