Skip to content

Commit 485b2ba

Browse files
staaldraadsamrose
authored andcommitted
fix: pass go override in overlays
1 parent 731a984 commit 485b2ba

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

nix/overlays/default.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@
5454
};
5555

5656
# place the gatekeeper module in the expected libpam location
57-
gatekeeper = self.inputs.gatekeeper.packages.${final.system}.default;
57+
gatekeeper = self.inputs.gatekeeper.packages.${final.system}.default.override {
58+
go = self.inputs.nixpkgs-go124.legacyPackages.${final.system}.go_1_24;
59+
};
5860
linux-pam = prev.linux-pam.overrideAttrs (old: {
5961
postInstall =
6062
(old.postInstall or "")

nix/packages/gatekeeper.nix

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,7 @@
44
{ system, ... }:
55
let
66

7-
go124 =
8-
let
9-
candidate = inputs.nixpkgs-go124.legacyPackages.${system};
10-
in
11-
if candidate ? go_1_24 then
12-
candidate.go_1_24
13-
else
14-
throw "❌ nixpkgs-go124.${system} does not provide go_1_24!";
7+
go124 = inputs.nixpkgs-go124.legacyPackages.${system}.go_1_24;
158
in
169
{
1710
packages.gatekeeper = inputs.gatekeeper.lib.${system}.makeGatekeeper { go = go124; };

0 commit comments

Comments
 (0)