diff --git a/home-manager/home.nix b/home-manager/home.nix --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -33,6 +33,7 @@ overlays.additions overlays.modifications overlays.unstable-packages overlays.ltrace-fix + overlays.fish-fix # Neovim nightly overlay (disabled as broken with unstable) # neovim-nightly-overlay.overlays.default diff --git a/hosts/iso/iso.nix b/hosts/iso/iso.nix --- a/hosts/iso/iso.nix +++ b/hosts/iso/iso.nix @@ -67,6 +67,13 @@ services.qemuGuest.enable = true; # Enables copy / paste when running in a KVM with spice. services.spice-vdagentd.enable = true; + nixpkgs = { + # You can add overlays here + overlays = [ + # Add overlays your own flake exports (from overlays and pkgs dir): + outputs.overlays.fish-fix + ]; + }; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; users.users.nixos = { openssh.authorizedKeys.keys = inputs.nix-secrets.ssh-keys; diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix --- a/hosts/sachiel/configuration.nix +++ b/hosts/sachiel/configuration.nix @@ -86,6 +86,7 @@ # Add overlays your own flake exports (from overlays and pkgs dir): outputs.overlays.additions outputs.overlays.modifications outputs.overlays.unstable-packages + outputs.overlays.fish-fix # Or define it inline, for example: # (final: prev: { diff --git a/overlays/default.nix b/overlays/default.nix --- a/overlays/default.nix +++ b/overlays/default.nix @@ -20,9 +20,23 @@ system = final.system; config.allowUnfree = true; }; }; - ltrace-fix = final: _prev: { - ltrace = _prev.ltrace.overrideAttrs { + ltrace-fix = final: prev: { + ltrace = prev.ltrace.overrideAttrs { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; }; + }; + fish-fix = final: prev: { + fish = prev.fish.overrideAttrs ( + finalAttrs: previousAttrs: { + version = "4.3.2"; + src = previousAttrs.src.override { + hash = "sha256-/B4U3giKGmU5B/L5HQLS1lU8f7hsfI4aCeOjWcQ1dpA="; + }; + cargoDeps = final.rustPlatform.fetchCargoVendor { + inherit (finalAttrs) src patches; + hash = "sha256-/udRRs/ieLfazVTwM47ElExN40QdAG/OqQXmYurgC1I="; + }; + } + ); }; }