diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2019-01-11 10:55:26 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2019-06-17 07:06:09 +0200 |
| commit | f0a1f7e02627e0e3f402ac55a7f6e112aba24df7 (patch) | |
| tree | d183831b51c50105df159ab44488b43a4b0c8c3a /pkgs | |
| parent | 62c60f471c59f5d521bbeb002e4d44196808b3d8 (diff) | |
| download | nixlib-f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.tar nixlib-f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.tar.gz nixlib-f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.tar.bz2 nixlib-f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.tar.lz nixlib-f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.tar.xz nixlib-f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.tar.zst nixlib-f0a1f7e02627e0e3f402ac55a7f6e112aba24df7.zip | |
xbps: fix build with gcc8
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/package-management/xbps/default.nix | 10 |
1 files 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) |