Skip to content

Commit 330dc52

Browse files
authored
fix: Fixes nix install by using correct pkg-configDepends config key (#1372)
* fix: Fixes nix install by using correct pkg-configDepends config key As reported by Hrafn Blóðbók, nix updated references to pkgconfig in its codebase to use the `pkg-config` spelling, this seems to break the installation of Carp using nix. See this PR: NixOS/nixpkgs@9bb3fcc * ci: Uses 21.05 release of nix to be compatible with pkg-config changes
1 parent e34197b commit 330dc52

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/nixpkgs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
os: [ubuntu-latest]
1313
steps:
1414
- uses: actions/checkout@v2.3.4
15-
- uses: cachix/install-nix-action@v15
15+
- uses: cachix/install-nix-action@v16
1616
with:
17-
nix_path: nixpkgs=channel:nixos-20.09
17+
nix_path: nixpkgs=channel:nixos-21.05
1818
- run: nix-build

default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ let
1111
cabal-install clang gdb
1212
ormolu hlint flamegraph ghc-prof-flamegraph
1313
] ++ lib.optionals stdenv.isLinux [ linuxPackages.perf tinycc zig ];
14-
pkgconfigDepends = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf glfw ];
14+
pkg-configDepends = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf glfw ];
1515
enableLibraryProfiling = profiling;
1616
enableExecutableProfiling = profiling;
1717
enableSharedLibraries = false;

0 commit comments

Comments
 (0)