diff options
author | Peder Bergebakken Sundt <pbsds@hotmail.com> | 2023-11-17 16:38:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-17 16:38:16 +0100 |
commit | 08be2ef0bfd785b984bd0fc66d764b153afaf28f (patch) | |
tree | 9e827aa0343a0c8976622c32c89b9396319e0bad /pkgs/tools/package-management | |
parent | b6ed7946a7917d29df2c3979b0b7c230f727119b (diff) | |
parent | 8da26616fd2d83d6359e3f3e9917fd578b3007de (diff) | |
download | nixlib-08be2ef0bfd785b984bd0fc66d764b153afaf28f.tar nixlib-08be2ef0bfd785b984bd0fc66d764b153afaf28f.tar.gz nixlib-08be2ef0bfd785b984bd0fc66d764b153afaf28f.tar.bz2 nixlib-08be2ef0bfd785b984bd0fc66d764b153afaf28f.tar.lz nixlib-08be2ef0bfd785b984bd0fc66d764b153afaf28f.tar.xz nixlib-08be2ef0bfd785b984bd0fc66d764b153afaf28f.tar.zst nixlib-08be2ef0bfd785b984bd0fc66d764b153afaf28f.zip |
Merge pull request #267383 from a-n-n-a-l-e-e/xbps_fix
xbps: 0.59.1 -> 0.59.2; fix build
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/xbps/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index c948c66b47f1..07aa1a7accc1 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; - version = "0.59.1"; + version = "0.59.2"; src = fetchFromGitHub { owner = "void-linux"; repo = "xbps"; rev = version; - sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; + hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14="; }; nativeBuildInputs = [ pkg-config which ]; @@ -17,16 +17,17 @@ stdenv.mkDerivation rec { patches = [ ./cert-paths.patch - # fix openssl 3 - (fetchpatch { - url = "https://github.com/void-linux/xbps/commit/db1766986c4389eb7e17c0e0076971b711617ef9.patch"; - hash = "sha256-CmyZdsHStPsELdEgeJBWIbXIuVeBhv7VYb2uGYxzUWQ="; - }) ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations"; postPatch = '' + # _BSD_SOURCE causes cpp warning + # https://github.com/void-linux/xbps/issues/576 + substituteInPlace bin/xbps-fbulk/main.c lib/util.c lib/external/dewey.c lib/external/fexec.c \ + --replace 'define _BSD_SOURCE' 'define _DEFAULT_SOURCE' \ + --replace '# define _BSD_SOURCE' '#define _DEFAULT_SOURCE' + # fix unprefixed ranlib (needed on cross) substituteInPlace lib/Makefile \ --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) ' |