From d512362e770d4016cbf8a2f573d00d6d2c4e61e6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 3 Sep 2019 22:07:06 +0200
Subject: [PATCH] Revert "xbps: fix build with gcc8"

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

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