From b07ef31a8bc1a27c9cb558907d7106cdaba52ad3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 21 Jan 2024 19:50:46 +0100 Subject: [PATCH 1/2] _9base: fix build on x86_64-darwin --- pkgs/by-name/_9/_9base/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix index 809b9da39af4..6f53870c36cf 100644 --- a/pkgs/by-name/_9/_9base/package.nix +++ b/pkgs/by-name/_9/_9base/package.nix @@ -47,6 +47,9 @@ stdenv.mkDerivation { # hide really common warning that floods the logs: # warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" "-D_DEFAULT_SOURCE" + ] ++ lib.optionals stdenv.cc.isClang [ + # error: call to undeclared function 'p9mbtowc'; ISO C99 and later do not support implicit function declarations + "-Wno-error=implicit-function-declaration" ]; LDFLAGS = lib.optionalString enableStatic "-static"; makeFlags = [ From 86a86c16927ade6b935b9af33fa076cb6cf93edb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 21 Jan 2024 22:14:24 +0100 Subject: [PATCH 2/2] _9base: move flags to env --- pkgs/by-name/_9/_9base/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/_9/_9base/package.nix b/pkgs/by-name/_9/_9base/package.nix index 6f53870c36cf..580c0ad698dc 100644 --- a/pkgs/by-name/_9/_9base/package.nix +++ b/pkgs/by-name/_9/_9base/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; strictDeps = true; nativeBuildInputs = [ pkg-config ]; - NIX_CFLAGS_COMPILE = [ + env.NIX_CFLAGS_COMPILE = toString ([ # workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: # ld: diffio.o:(.bss+0x16): multiple definition of `bflag'; diffdir.o:(.bss+0x6): first defined here @@ -50,8 +50,8 @@ stdenv.mkDerivation { ] ++ lib.optionals stdenv.cc.isClang [ # error: call to undeclared function 'p9mbtowc'; ISO C99 and later do not support implicit function declarations "-Wno-error=implicit-function-declaration" - ]; - LDFLAGS = lib.optionalString enableStatic "-static"; + ]); + env.LDFLAGS = lib.optionalString enableStatic "-static"; makeFlags = [ "PREFIX=${placeholder "out"}" ];