diff --git a/hosts/h/default.nix b/hosts/h/default.nix index c91fc06..1a39621 100644 --- a/hosts/h/default.nix +++ b/hosts/h/default.nix @@ -45,6 +45,10 @@ in { scripts = with super.weechatScripts; [ highmon weepushover ]; }; }; + go = super.go_1_19.overrideAttrs + (old: { patches = old.patches ++ [ ../../overlays/452438.diff ]; }); + go_1_19 = super.go_1_19.overrideAttrs + (old: { patches = old.patches ++ [ ../../overlays/452438.diff ]; }); }) ]; diff --git a/overlays/default.nix b/overlays/default.nix index 0074a86..056455a 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,19 +1,4 @@ -{ self, config, pkgs, lib, isUnstable, ... }: -let go = self: super: { - go = super.go_1_19.overrideAttrs (old: { - patches = old.patches ++ [ - ./452438.diff - ]; - }); -}; -go1_19 = self: super: { - go_1_19 = super.go_1_19.overrideAttrs (old: { - patches = old.patches ++ [ - ./452438.diff - ]; - }); -}; -in { +{ self, config, pkgs, lib, isUnstable, ... }: { nixpkgs.overlays = if isUnstable then [ (self: super: { @@ -30,8 +15,6 @@ in { ] else [ - go - go1_19 (self: super: { matrix-synapse = super.matrix-synapse.overrideAttrs (old: rec { version = "1.74.0"; diff --git a/pkgs/gotosocial.nix b/pkgs/gotosocial.nix index 6df2c23..d951261 100644 --- a/pkgs/gotosocial.nix +++ b/pkgs/gotosocial.nix @@ -38,7 +38,7 @@ buildGo119Module rec { preBuild = '' echo ${go}/bin/go ${go}/bin/go version - ''; + ''; postInstall = '' mkdir -p $out/assets