dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

simavr: fix build on Darwin

Browse Source 
Remove unnecessary compiler flag not recognized by Clang.

Borrow setup hook from Wine which filters out Darwin-specific flags not
recognized by avr-gcc, which is used to build the test firmware.
This commit is contained in:
Thomas Watson 2023-01-01 12:09:45 -06:00
parent 1f4feb7c6f
commit 6e13168f47
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/tools/simavr/default.nix
View File

@ -1,9 +1,17 @@
{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut { lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut
, avrgcc, avrlibc , avrgcc, avrlibc
, libGLU, libGL , libGLU, libGL
, GLUT }: , GLUT }:
stdenv.mkDerivation rec { let
setupHookDarwin = makeSetupHook {
name = "darwin-avr-gcc-hook";
substitutions = {
darwinSuffixSalt = stdenv.cc.suffixSalt;
avrSuffixSalt = avrgcc.suffixSalt;
};
} ./setup-hook-darwin.sh;
in stdenv.mkDerivation rec {
pname = "simavr"; pname = "simavr";
version = "1.7"; version = "1.7";
@ -22,9 +30,8 @@ stdenv.mkDerivation rec {
"AVR=avr-" "AVR=avr-"
]; ];
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; nativeBuildInputs = [ which pkg-config avrgcc ]
++ lib.optional stdenv.isDarwin setupHookDarwin;
nativeBuildInputs = [ which pkg-config avrgcc ];
buildInputs = [ libelf freeglut libGLU libGL ] buildInputs = [ libelf freeglut libGLU libGL ]
++ lib.optional stdenv.isDarwin GLUT; ++ lib.optional stdenv.isDarwin GLUT;
@ -35,7 +42,6 @@ stdenv.mkDerivation rec {
checkTarget = "-C tests run_tests"; checkTarget = "-C tests run_tests";
meta = with lib; { meta = with lib; {
broken = stdenv.isDarwin;
description = "A lean and mean Atmel AVR simulator"; description = "A lean and mean Atmel AVR simulator";
homepage = "https://github.com/buserror/simavr"; homepage = "https://github.com/buserror/simavr";
license = licenses.gpl3; license = licenses.gpl3;

34
pkgs/development/tools/simavr/setup-hook-darwin.sh Normal file
View File

@ -0,0 +1,34 @@
fixupCFlagsForDarwin() {
# Because it’s getting called from a Darwin stdenv, avr-gcc will pick up on
# Darwin-specific flags, and it will barf and die on -iframework in
# particular. Strip them out, so simavr can compile its test firmware.
cflagsFilter='s|-F[^ ]*||g;s|-iframework [^ ]*||g;s|-isystem [^ ]*||g;s| *| |g'
# The `CoreFoundation` reference is added by `linkSystemCoreFoundationFramework` in the
# Apple SDK’s setup hook. Remove that because avr-gcc will fail due to file not found.
ldFlagsFilter='s|/nix/store/[^-]*-apple-framework-CoreFoundation[^ ]*||g'
# `cc-wrapper.sh`` supports getting flags from a system-specific salt. While it is currently a
# tuple, that’s not considered a stable interface, so the derivation will provide them.
export NIX_CFLAGS_COMPILE_@darwinSuffixSalt@=${NIX_CFLAGS_COMPILE-}
export NIX_LDFLAGS_@darwinSuffixSalt@=${NIX_LDFLAGS-}
echo removing @darwinSuffixSalt@-specific flags from NIX_CFLAGS_COMPILE for @avrSuffixSalt@
export NIX_CFLAGS_COMPILE_@avrSuffixSalt@+="$(sed "$cflagsFilter" <<< "$NIX_CFLAGS_COMPILE")"
echo removing @darwinSuffixSalt@-specific flags from NIX_LDFLAGS for @avrSuffixSalt@
export NIX_LDFLAGS_@avrSuffixSalt@+="$(sed "$ldFlagsFilter;$cflagsFilter" <<< "$NIX_LDFLAGS")"
# Make sure the global flags aren’t accidentally influencing the platform-specific flags.
export NIX_CFLAGS_COMPILE=""
export NIX_LDFLAGS=""
}
# This is pretty hacky, but this hook _must_ run after `linkSystemCoreFoundationFramework`.
function runFixupCFlagsForDarwinLast() {
preConfigureHooks+=(fixupCFlagsForDarwin)
}
if [ -z "${dontFixupCFlagsForDarwin-}" ]; then
postUnpackHooks+=(runFixupCFlagsForDarwinLast)
fi