premake5: 5.0.0-beta2 -> 5.0.0-beta4

The patch needed a small update to apply. Fixes NixOS#369802 ("Build failure: premake5")
erratic-pattern · Jan 8, 2025 · 0155aca · 0155aca
1 parent 1e547d0
commit 0155aca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "premake5";
-  version = "5.0.0-beta2";
+  version = "5.0.0-beta4";
 
   src = fetchFromGitHub {
     owner = "premake";
     repo = "premake-core";
     rev = "v${version}";
-    sha256 = "sha256-2R5gq4jaQsp8Ny1oGuIYkef0kn2UG9jMf20vq0714oY=";
+    sha256 = "sha256-sNLCyIHWDW/8jIrMFCZAqtWsh4SRugqtPR4HaoW/Vzk=";
   };
 
   buildInputs =

diff --git a/pkgs/development/tools/misc/premake/no-curl-ca.patch b/pkgs/development/tools/misc/premake/no-curl-ca.patch
@@ -11,25 +11,27 @@ 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"
+@@ -36,21 +36,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/openssl/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
+-			"/etc/ssl/cert.pem",
+-			"/boot/system/data/ssl/CARootCertificates.pem" } do
 -			if os.isfile(f) then
 -				ca = f
 -				break
 -			end
 -		end
  		if ca then
- 			defines { 'CURL_CA_BUNDLE="' .. ca .. '"' }
+ 			defines { 'CURL_CA_BUNDLE="' .. ca .. '"', 'CURL_CA_PATH="' .. path.getdirectory(ca) .. '"' }
  		end
 -- 
 2.37.2