From a55906b5955e615ab6de23cd558c248fd0167e05 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 10 Mar 2025 14:02:23 +0100 Subject: [PATCH] bootil: fix build with gcc 14 --- pkgs/by-name/bo/bootil/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bo/bootil/package.nix b/pkgs/by-name/bo/bootil/package.nix index a3157202b36d..55c9d5bc5680 100644 --- a/pkgs/by-name/bo/bootil/package.nix +++ b/pkgs/by-name/bo/bootil/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitHub, premake4, + zlib, }: stdenv.mkDerivation { @@ -16,12 +17,18 @@ stdenv.mkDerivation { sha256 = "1njdj6nvmwf7j2fwqbyvd1cf5l52797vk2wnsliylqdzqcjmfpij"; }; + enableParallelBuilding = true; + # Avoid guessing where files end up. Just use current directory. postPatch = '' substituteInPlace projects/premake4.lua \ - --replace 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )' + --replace-fail 'location ( os.get() .. "/" .. _ACTION )' 'location ( ".." )' substituteInPlace projects/bootil.lua \ - --replace 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )' + --replace-fail 'targetdir ( "../lib/" .. os.get() .. "/" .. _ACTION )' 'targetdir ( ".." )' + + rm src/3rdParty/zlib -rf + mkdir src/3rdParty/zlib + cp -r ${zlib.dev}/include/z{conf,lib}.h src/3rdParty/zlib ''; nativeBuildInputs = [ premake4 ];