diff options
author | Will Dietz <w@wdtz.org> | 2018-05-18 09:05:44 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-05-18 12:42:34 -0500 |
commit | 0c30d6597ef1d01d150ce556e1df4717ae45b089 (patch) | |
tree | 8440e4eca4ec3e1d6632503071dbe4ea4b21ae7c /pkgs/tools | |
parent | 641a62305305692c294ab3f67c597bc90067a667 (diff) | |
download | nixlib-0c30d6597ef1d01d150ce556e1df4717ae45b089.tar nixlib-0c30d6597ef1d01d150ce556e1df4717ae45b089.tar.gz nixlib-0c30d6597ef1d01d150ce556e1df4717ae45b089.tar.bz2 nixlib-0c30d6597ef1d01d150ce556e1df4717ae45b089.tar.lz nixlib-0c30d6597ef1d01d150ce556e1df4717ae45b089.tar.xz nixlib-0c30d6597ef1d01d150ce556e1df4717ae45b089.tar.zst nixlib-0c30d6597ef1d01d150ce556e1df4717ae45b089.zip |
xbps: init at 0.52
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/package-management/xbps/cert-paths.patch | 25 | ||||
-rw-r--r-- | pkgs/tools/package-management/xbps/default.nix | 38 |
2 files changed, 63 insertions, 0 deletions
diff --git a/pkgs/tools/package-management/xbps/cert-paths.patch b/pkgs/tools/package-management/xbps/cert-paths.patch new file mode 100644 index 000000000000..569161d9f2e4 --- /dev/null +++ b/pkgs/tools/package-management/xbps/cert-paths.patch @@ -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 + diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix new file mode 100644 index 000000000000..b78b0ae110e1 --- /dev/null +++ b/pkgs/tools/package-management/xbps/default.nix @@ -0,0 +1,38 @@ +{ 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"; + license = licenses.bsd2; + maintainers = with maintainers; [ dtzWill ]; + }; +} |