public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "xbps: fix build with gcc8"

Browse Source 
This reverts commit f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.
This commit is contained in:
Franz Pletz 2019-09-03 22:07:06 +02:00
parent be9901afe2
commit d512362e77
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/package-management/xbps/default.nix
View File

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