Unverified Commit 08be2ef0 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

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

xbps: 0.59.1 -> 0.59.2; fix build
parents b6ed7946 8da26616

pkgs/tools/package-management/xbps/default.nix

+9 −8
Original line number Diff line number Diff line 
{ 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) '