diff options
| author | bors-servo <servo-ops@mozilla.com> | 2022-10-09 12:24:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 12:24:46 -0400 |
| commit | 543fc51eeb9c479fc10cc61c26b65becf6c8232c (patch) | |
| tree | 40615cb0970edad8d55c4886b070574d0e2035ec | |
| parent | 30525b4f5fe71a18c7d9520b6509fd1dd75464f8 (diff) | |
| parent | 57eb5a56d1f1ed79f3df83d21afb3fa53cb6b7e2 (diff) | |
| download | servo-543fc51eeb9c479fc10cc61c26b65becf6c8232c.tar.gz servo-543fc51eeb9c479fc10cc61c26b65becf6c8232c.zip | |
Auto merge of #29007 - yvt:patch/nix-pkgconfig, r=jdm
`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
| -rw-r--r-- | etc/shell.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/shell.nix b/etc/shell.nix index 5d8a7b99211..ee02eb6aeb9 100644 --- a/etc/shell.nix +++ b/etc/shell.nix @@ -18,7 +18,7 @@ clangStdenv.mkDerivation rec { rustup # 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])) ] ++ (lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit |