lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

3p: patch go so that things work again

Browse source
This commit is contained in:
Luke Granger-Brown 2023-08-09 02:51:03 +01:00
parent eea7e9ad65
commit 6d7ef7de57
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
third_party/default.nix vendored
View file

@ -31,6 +31,27 @@ let
nixpkgs = import ./nixpkgs { nixpkgs = import ./nixpkgs {
inherit system; inherit system;
config = nixpkgsConfig; config = nixpkgsConfig;
overlays = [(final: prev: {
go_1_20_socket = prev.go_1_20.overrideAttrs (old: {
patches = old.patches ++ [(final.fetchpatch {
url = "https://go.googlesource.com/go/+/ad087ee2804b7ce088161df04403c93ddc623888%5E%21?format=TEXT";
sha256 = "14z1rgn2qhmzhk9b8iksdknzrf0fbbhabqngcz5jlskc8vwdd14v";
decode = "base64 -d";
})];
});
vault = prev.vault.override {
buildGoModule = prev.buildGoModule.override {
go = final.go_1_20_socket;
};
};
go_1_19_socket = prev.go_1_19.overrideAttrs (old: {
patches = old.patches ++ [(final.fetchpatch {
url = "https://go.googlesource.com/go/+/ad087ee2804b7ce088161df04403c93ddc623888%5E%21?format=TEXT";
sha256 = "14z1rgn2qhmzhk9b8iksdknzrf0fbbhabqngcz5jlskc8vwdd14v";
decode = "base64 -d";
})];
});
})];
}; };
crate2nixSrc = nixpkgs.fetchFromGitHub { crate2nixSrc = nixpkgs.fetchFromGitHub {
owner = "kolloch"; owner = "kolloch";

2
third_party/tvl/nix/buildGo/default.nix vendored
View file

@ -24,7 +24,7 @@ let
toString; toString;
inherit (pkgs) lib runCommand runCommandCC fetchFromGitHub protobuf symlinkJoin; inherit (pkgs) lib runCommand runCommandCC fetchFromGitHub protobuf symlinkJoin;
go = pkgs.go_1_19; go = pkgs.go_1_19_socket;
# Helpers for low-level Go compiler invocations # Helpers for low-level Go compiler invocations
spaceOut = lib.concatStringsSep " "; spaceOut = lib.concatStringsSep " ";