Skip to content

Commit 76a8307

Browse files
authored
Auto merge of servo#28978 - yvt:patch/nix-darwin-framework, r=jdm
`etc/shell.nix`: Add `AppKit` to `buildInputs` on Darwin System framework dependencies need to be specified explicitly on Darwin. Fixes a linker error when building Servo inside a Nix shell on macOS. Signed-off-by: yvt <i@yvt.jp> --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #___ (GitHub issue number if applicable) --- - [ ] There are tests for these changes OR - [x] These changes do not require tests because they don't affect the production code
2 parents c1edf69 + 71a6a00 commit 76a8307

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

etc/shell.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ clangStdenv.mkDerivation rec {
2020
# Build utilities
2121
cmake dbus gcc git pkgconfig which llvm autoconf213 perl yasm m4
2222
(python3.withPackages (ps: with ps; [virtualenv pip dbus]))
23-
];
23+
] ++ (lib.optionals stdenv.isDarwin [
24+
darwin.apple_sdk.frameworks.AppKit
25+
]);
2426

2527
LIBCLANG_PATH = llvmPackages.clang-unwrapped.lib + "/lib/";
2628

0 commit comments

Comments
 (0)