cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #267383 from a-n-n-a-l-e-e/xbps_fix

Browse source 
xbps: 0.59.1 -> 0.59.2; fix build
This commit is contained in:
Peder Bergebakken Sundt 2023-11-17 16:38:16 +01:00 committed by GitHub
commit 08be2ef0bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/tools/package-management/xbps/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "xbps"; pname = "xbps";
version = "0.59.1"; version = "0.59.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "void-linux"; owner = "void-linux";
repo = "xbps"; repo = "xbps";
rev = version; rev = version;
sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; hash = "sha256-3+LzFLDZ1zfRPBETMlpEn66zsfHRHQLlgeZPdMtmA14=";
}; };
nativeBuildInputs = [ pkg-config which ]; nativeBuildInputs = [ pkg-config which ];
@ -17,16 +17,17 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./cert-paths.patch ./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"; env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations";
postPatch = '' 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) # fix unprefixed ranlib (needed on cross)
substituteInPlace lib/Makefile \ substituteInPlace lib/Makefile \
--replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) ' --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) '