forked from mirrors/nixpkgs
commit
61fd8d63b4
25
pkgs/tools/package-management/xbps/cert-paths.patch
Normal file
25
pkgs/tools/package-management/xbps/cert-paths.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
From d13a550dbc8876c35b912fe3e0eadd45b278be27 Mon Sep 17 00:00:00 2001
|
||||
From: Will Dietz <w@wdtz.org>
|
||||
Date: Fri, 18 May 2018 09:51:48 -0500
|
||||
Subject: [PATCH] add certificate path fallbacks
|
||||
|
||||
---
|
||||
lib/fetch/common.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/lib/fetch/common.c b/lib/fetch/common.c
|
||||
index 94fb2651..79b50115 100644
|
||||
--- a/lib/fetch/common.c
|
||||
+++ b/lib/fetch/common.c
|
||||
@@ -1012,6 +1012,8 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
|
||||
|
||||
if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
|
||||
ca_cert_file = getenv("SSL_CA_CERT_FILE");
|
||||
+ ca_cert_file = ca_cert_file ? ca_cert_file : getenv("NIX_SSL_CERT_FILE");
|
||||
+ ca_cert_file = ca_cert_file ? ca_cert_file : "/etc/ssl/certs/ca-certificates.crt";
|
||||
ca_cert_path = getenv("SSL_CA_CERT_PATH") != NULL ?
|
||||
getenv("SSL_CA_CERT_PATH") : X509_get_default_cert_dir();
|
||||
if (verbose) {
|
||||
--
|
||||
2.17.0
|
||||
|
39
pkgs/tools/package-management/xbps/default.nix
Normal file
39
pkgs/tools/package-management/xbps/default.nix
Normal file
|
@ -0,0 +1,39 @@
|
|||
{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xbps-${version}";
|
||||
version = "0.52";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "voidlinux";
|
||||
repo = "xbps";
|
||||
rev = version;
|
||||
sha256 = "1sf6iy9l3dijsczsngzbhksshfm1374g2rrdasc04l6gz35l2cdp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig which ];
|
||||
|
||||
buildInputs = [ zlib openssl libarchive ];
|
||||
|
||||
patches = [ ./cert-paths.patch ];
|
||||
|
||||
postPatch = ''
|
||||
# fix unprefixed ranlib (needed on cross)
|
||||
substituteInPlace lib/Makefile \
|
||||
--replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) '
|
||||
|
||||
# Don't try to install keys to /var/db/xbps, put in $out/share for now
|
||||
substituteInPlace data/Makefile \
|
||||
--replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/voidlinux/xbps;
|
||||
description = "The X Binary Package System";
|
||||
platforms = platforms.linux; # known to not work on Darwin, at least
|
||||
license = licenses.bsd2;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
|
@ -21257,6 +21257,8 @@ with pkgs;
|
|||
|
||||
xboxdrv = callPackage ../misc/drivers/xboxdrv { };
|
||||
|
||||
xbps = callPackage ../tools/package-management/xbps { };
|
||||
|
||||
xcftools = callPackage ../tools/graphics/xcftools { };
|
||||
|
||||
xhyve = callPackage ../applications/virtualization/xhyve {
|
||||
|
|
Loading…
Reference in a new issue