Skip to content

Commit 543fc51

Browse files
authored
Auto merge of servo#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]: NixOS/nixpkgs#55094 [2]: NixOS/nixpkgs#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
2 parents 30525b4 + 57eb5a5 commit 543fc51

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

etc/shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ clangStdenv.mkDerivation rec {
1818
rustup
1919

2020
# Build utilities
21-
cmake dbus gcc git pkgconfig which llvm autoconf213 perl yasm m4
21+
cmake dbus gcc git pkg-config which llvm autoconf213 perl yasm m4
2222
(python3.withPackages (ps: with ps; [virtualenv pip dbus]))
2323
] ++ (lib.optionals stdenv.isDarwin [
2424
darwin.apple_sdk.frameworks.AppKit

0 commit comments

Comments
 (0)