diff options
| author | Robert Scott <code@humanleg.org.uk> | 2024-05-31 21:13:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-31 21:13:46 +0100 |
| commit | 7b1f1fb886ad621b95ccb8e1b9887d931a91e081 (patch) | |
| tree | dd51fa85779cdf7aa0177f8c5bcc2090eb38cc89 /pkgs | |
| parent | 5d06cdbff43004699c0f5a9d2134e09c7e4962ed (diff) | |
| parent | 59271930836fae3355e8027280deffb5c914d28c (diff) | |
Merge pull request #315843 from wegank/premake5-darwin
premake5: fix build on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/misc/premake/5.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index 841e8480da1ab..d33a9c73c9c7f 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { --replace "ca = nil" "ca = '${cacert}/etc/ssl/certs/ca-bundle.crt'" '' + lib.optionalString stdenv.isDarwin '' substituteInPlace premake5.lua \ - --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 + --replace -mmacosx-version-min=10.4 -mmacosx-version-min=10.5 \ + --replace-fail '"-arch arm64"' '""' \ + --replace-fail '"-arch x86_64"' '""' '' + lib.optionalString stdenv.hostPlatform.isStatic '' substituteInPlace \ binmodules/example/premake5.lua \ @@ -34,6 +36,10 @@ stdenv.mkDerivation rec { make -f Bootstrap.mak linux ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=implicit-function-declaration" + ]); + installPhase = '' install -Dm755 bin/release/premake5 $out/bin/premake5 ''; @@ -47,6 +53,5 @@ stdenv.mkDerivation rec { mainProgram = "premake5"; license = lib.licenses.bsd3; platforms = lib.platforms.darwin ++ lib.platforms.linux; - broken = stdenv.isDarwin && stdenv.isAarch64; }; } |