Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #29007 - yvt:patch/nix-pkgconfig, r=jdm

Browse source 
`etc/shell.nix`: Replace `pkgconfig` with `pkg-config`

`pkgconfig` is [an old name][1] of `pkg-config` that has been [completely removed][2] in a recent version of nixpkgs.

[1]: https://github.com/NixOS/nixpkgs/pull/55094
[2]: https://github.com/NixOS/nixpkgs/pull/192681

---
- [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-10-09 12:24:46 -04:00 • committed by GitHub
commit 543fc51eeb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/shell.nix
View file

@ -18,7 +18,7 @@ clangStdenv.mkDerivation rec {
rustup rustup
# Build utilities # Build utilities
cmake dbus gcc git pkgconfig which llvm autoconf213 perl yasm m4 cmake dbus gcc git pkg-config 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 [ ] ++ (lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.AppKit