Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 07:25:35 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #28978 - yvt:patch/nix-darwin-framework, r=jdm

Browse source 
`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
This commit is contained in:
bors-servo 2022-09-23 23:50:53 -04:00 • committed by GitHub
commit 76a8307164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/shell.nix
View file

@ -20,7 +20,9 @@ clangStdenv.mkDerivation rec {
# Build utilities # Build utilities
cmake dbus gcc git pkgconfig which llvm autoconf213 perl yasm m4 cmake dbus gcc git pkgconfig which llvm autoconf213 perl yasm m4
(python3.withPackages (ps: with ps; [virtualenv pip dbus])) (python3.withPackages (ps: with ps; [virtualenv pip dbus]))
]; ] ++ (lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
]);
LIBCLANG_PATH = llvmPackages.clang-unwrapped.lib + "/lib/"; LIBCLANG_PATH = llvmPackages.clang-unwrapped.lib + "/lib/";