premake5: 5.0.0-beta4 -> 5.0.0-beta8 (#492252)

This commit is contained in:
Vladimír Čunát
2026-02-26 21:32:52 +00:00
committed by GitHub
3 changed files with 6 additions and 17 deletions
+1 -1
View File
@@ -232,7 +232,7 @@ let
# (can't use --prebuilt-core or let it build a core on its own without making core updates impossible)
postPatch = ''
substituteInPlace premake5.lua \
--replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"'
--replace-fail 'flags "LinkTimeOptimization"' 'linktimeoptimization "Off"'
substituteInPlace gframe/game.cpp \
--replace-fail 'ocgcore = LoadOCGcore(Utils::GetWorkingDirectory())' 'ocgcore = LoadOCGcore("${lib.getLib ocgcore}/lib/")'
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "premake5";
version = "5.0.0-beta4";
version = "5.0.0-beta8";
src = fetchFromGitHub {
owner = "premake";
repo = "premake-core";
rev = "v${finalAttrs.version}";
sha256 = "sha256-sNLCyIHWDW/8jIrMFCZAqtWsh4SRugqtPR4HaoW/Vzk=";
hash = "sha256-Tl/XU9Hy/VZw59S4K478EaLgE88/oTzLCe+DoVwtlcU=";
};
buildInputs = [
@@ -1,17 +1,8 @@
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
index b1e32fd..26dd399 100644
--- a/contrib/curl/premake5.lua
+++ b/contrib/curl/premake5.lua
@@ -36,21 +36,6 @@ project "curl-lib"
@@ -36,22 +36,6 @@ project "curl-lib"
-- find the location of the ca bundle
local ca = nil
@@ -24,6 +15,7 @@ index 474f5cfa..553bbd02 100644
- "/usr/local/share/certs/ca-root-nss.crt",
- "/etc/certs/ca-certificates.crt",
- "/etc/ssl/cert.pem",
- "/etc/ssl/cacert.pem",
- "/boot/system/data/ssl/CARootCertificates.pem" } do
- if os.isfile(f) then
- ca = f
@@ -33,6 +25,3 @@ index 474f5cfa..553bbd02 100644
if ca then
defines { 'CURL_CA_BUNDLE="' .. ca .. '"', 'CURL_CA_PATH="' .. path.getdirectory(ca) .. '"' }
end
--
2.37.2