nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 20:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #210454 from helsinki-systems/xbps_ossl3

Browse Source 
xbps: unpin openssl_1_1
This commit is contained in:
ajs124 2023-02-06 00:56:28 +01:00 committed by GitHub
commit 8255262d78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/package-management/xbps/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: { lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, which, zlib, openssl, libarchive }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "xbps"; pname = "xbps";
@ -15,9 +15,16 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib openssl libarchive ]; 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 = '' postPatch = ''
# fix unprefixed ranlib (needed on cross) # fix unprefixed ranlib (needed on cross)

4
pkgs/top-level/all-packages.nix
View File

@ -38498,9 +38498,7 @@ with pkgs;
xorex = callPackage ../tools/security/xorex { }; xorex = callPackage ../tools/security/xorex { };
xbps = callPackage ../tools/package-management/xbps { xbps = callPackage ../tools/package-management/xbps { };
openssl = openssl_1_1;
};
xcftools = callPackage ../tools/graphics/xcftools { }; xcftools = callPackage ../tools/graphics/xcftools { };