Skip to content

Commit 0155aca

Browse files
committed
premake5: 5.0.0-beta2 -> 5.0.0-beta4
The patch needed a small update to apply. Fixes NixOS#369802 ("Build failure: premake5")
1 parent 1e547d0 commit 0155aca

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

pkgs/development/tools/misc/premake/5.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
stdenv.mkDerivation rec {
1212
pname = "premake5";
13-
version = "5.0.0-beta2";
13+
version = "5.0.0-beta4";
1414

1515
src = fetchFromGitHub {
1616
owner = "premake";
1717
repo = "premake-core";
1818
rev = "v${version}";
19-
sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY=";
19+
sha256 = "sha256-sNLCyIHWDW/8jIrMFCZAqtWsh4SRugqtPR4HaoW/Vzk=";
2020
};
2121

2222
buildInputs =

pkgs/development/tools/misc/premake/no-curl-ca.patch

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,27 @@ diff --git a/contrib/curl/premake5.lua b/contrib/curl/premake5.lua
1111
index 474f5cfa..553bbd02 100644
1212
--- a/contrib/curl/premake5.lua
1313
+++ b/contrib/curl/premake5.lua
14-
@@ -32,19 +32,6 @@ project "curl-lib"
14+
@@ -36,21 +36,6 @@ project "curl-lib"
1515

1616
-- find the location of the ca bundle
1717
local ca = nil
1818
- for _, f in ipairs {
1919
- "/etc/ssl/certs/ca-certificates.crt",
20+
- "/etc/openssl/certs/ca-certificates.crt",
2021
- "/etc/pki/tls/certs/ca-bundle.crt",
2122
- "/usr/share/ssl/certs/ca-bundle.crt",
2223
- "/usr/local/share/certs/ca-root.crt",
2324
- "/usr/local/share/certs/ca-root-nss.crt",
2425
- "/etc/certs/ca-certificates.crt",
25-
- "/etc/ssl/cert.pem" } do
26+
- "/etc/ssl/cert.pem",
27+
- "/boot/system/data/ssl/CARootCertificates.pem" } do
2628
- if os.isfile(f) then
2729
- ca = f
2830
- break
2931
- end
3032
- end
3133
if ca then
32-
defines { 'CURL_CA_BUNDLE="' .. ca .. '"' }
34+
defines { 'CURL_CA_BUNDLE="' .. ca .. '"', 'CURL_CA_PATH="' .. path.getdirectory(ca) .. '"' }
3335
end
3436
--
3537
2.37.2

0 commit comments

Comments
 (0)