Unverified Commit 8255262d authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #210454 from helsinki-systems/xbps_ossl3 

xbps: unpin openssl_1_1
parents 516a9816 06ef4c17

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

+10 −3
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }:

{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }:



stdenv.mkDerivation rec {

  pname = "xbps";
@@ -15,9 +15,16 @@ stdenv.mkDerivation rec { 


  buildInputs = [ zlib openssl libarchive ];



  patches = [ ./cert-paths.patch ];

  patches = [

    ./cert-paths.patch

    # fix openssl 3

    (fetchpatch {

      url = "https://github.com/void-linux/xbps/commit/db1766986c4389eb7e17c0e0076971b711617ef9.patch";

      hash = "sha256-CmyZdsHStPsELdEgeJBWIbXIuVeBhv7VYb2uGYxzUWQ=";

    })

  ];



  NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";

  NIX_CFLAGS_COMPILE = "-Wno-error=unused-result -Wno-error=deprecated-declarations";



  postPatch = ''

    # fix unprefixed ranlib (needed on cross)

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -38498,9 +38498,7 @@ with pkgs; 














  xorex = callPackage ../tools/security/xorex { };



























  xbps = callPackage ../tools/package-management/xbps {













    openssl = openssl_1_1;













  };













  xbps = callPackage ../tools/package-management/xbps { };





























  xcftools = callPackage ../tools/graphics/xcftools { };