Commit 084f6a3e authored by abysssol's avatar abysssol
Browse files

nixos/ollama: make `rocmOverrideGfx` backward compatible 

The initial version of `rocmOverrideGfx` incorrectly used `lib.mkIf`
in an attempt to prevent interference with previous uses of
`environmentVariables.HSA_OVERRIDE_GFX_VERSION`.

However, the effect was actually to simply erase existing definitions of
`HSA_OVERRIDE_GFX_VERSION` until `rocmOverrideGfx` was set,
which was the situation I was trying to avoid in the first place.

This fixes the bug by switching from `lib.mkIf` to `lib.optionalAttrs`.
parent 339d0cd6

nixos/modules/services/misc/ollama.nix

+10 −6
Original line number Diff line number Diff line
@@ -184,11 +184,15 @@ in 
      description = "Server for local large language models";

      wantedBy = [ "multi-user.target" ];

      after = [ "network.target" ];

      environment = cfg.environmentVariables // {

      environment =

        cfg.environmentVariables

        // {

          HOME = cfg.home;

          OLLAMA_MODELS = cfg.models;

          OLLAMA_HOST = "${cfg.host}:${toString cfg.port}";

        HSA_OVERRIDE_GFX_VERSION = lib.mkIf (cfg.rocmOverrideGfx != null) cfg.rocmOverrideGfx;

        }

        // lib.optionalAttrs (cfg.rocmOverrideGfx != null) {

          HSA_OVERRIDE_GFX_VERSION = cfg.rocmOverrideGfx;

        };

      serviceConfig =

        lib.optionalAttrs staticUser {