From 31e8b2d0699f1a90b25aeb7c39cf1e8561ffa8e4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 29 Aug 2019 21:33:10 -0500 Subject: [PATCH 1/2] xbps: 0.56 -> 0.57 --- pkgs/tools/package-management/xbps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 5954ca4959b..f85f7988827 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xbps"; - version = "0.56"; + version = "0.57"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0hqvq6fq62l5sgm4fy3zb0ks889d21mqz4f4my3iifs6c9f50na2"; + sha256 = "1aaa0h265lx85hmcvg7zpg7iiq6dzzlyxqazn1s387ss709i5gxn"; }; nativeBuildInputs = [ pkgconfig which ]; From 2e808509f01865e86568c107d20c0d4f8fa6ab1e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 4 Sep 2019 20:45:18 -0500 Subject: [PATCH 2/2] xbps: fix build w/glibc, disable errors due to unused fread result --- pkgs/tools/package-management/xbps/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index f85f7988827..f83a1498825 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./cert-paths.patch ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=unused-result" ]; + postPatch = '' # fix unprefixed ranlib (needed on cross) substituteInPlace lib/Makefile \