premake5: 5.0.0-alpha12 -> 5.0.0-beta2

Also set ssl certificates
This commit is contained in:
Ellie Hermaszewska 2022-10-03 17:18:43 +08:00 committed by Rick van Schijndel
parent 7e1cf49870
commit f6c2cbab84
2 changed files with 45 additions and 5 deletions

View file

@ -1,21 +1,25 @@
{ lib, stdenv, fetchFromGitHub, Foundation, readline }:
{ lib, stdenv, fetchFromGitHub, libuuid, cacert, Foundation, readline }:
with lib;
stdenv.mkDerivation rec {
pname = "premake5";
version = "5.0.0-alpha12";
version = "5.0.0-beta2";
src = fetchFromGitHub {
owner = "premake";
repo = "premake-core";
rev = "v${version}";
sha256 = "1h3hr96pdz94njn4bg02ldcz0k5j1x017d8svc7fdyvl2b77nqzf";
sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY=";
};
buildInputs = optionals stdenv.isDarwin [ Foundation readline ];
buildInputs = [ libuuid ] ++ optionals stdenv.isDarwin [ Foundation readline ];
patchPhase = optional stdenv.isDarwin ''
patches = [ ./no-curl-ca.patch ];
patchPhase = ''
substituteInPlace contrib/curl/premake5.lua \
--replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'"
'' + optionalString stdenv.isDarwin ''
substituteInPlace premake5.lua \
--replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5
'';

View file

@ -0,0 +1,36 @@
From a26e36d55cd2447488e01b2ff4ac65e2596862cd Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <git@monoid.al>
Date: Mon, 3 Oct 2022 16:50:33 +0800
Subject: [PATCH] Do not set CURL_CA_BUNDLE
---
contrib/curl/premake5.lua | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/contrib/curl/premake5.lua b/contrib/curl/premake5.lua
index 474f5cfa..553bbd02 100644
--- a/contrib/curl/premake5.lua
+++ b/contrib/curl/premake5.lua
@@ -32,19 +32,6 @@ project "curl-lib"
-- find the location of the ca bundle
local ca = nil
- for _, f in ipairs {
- "/etc/ssl/certs/ca-certificates.crt",
- "/etc/pki/tls/certs/ca-bundle.crt",
- "/usr/share/ssl/certs/ca-bundle.crt",
- "/usr/local/share/certs/ca-root.crt",
- "/usr/local/share/certs/ca-root-nss.crt",
- "/etc/certs/ca-certificates.crt",
- "/etc/ssl/cert.pem" } do
- if os.isfile(f) then
- ca = f
- break
- end
- end
if ca then
defines { 'CURL_CA_BUNDLE="' .. ca .. '"' }
end
--
2.37.2