dirty fix for imagemagick not showing up in $PATH

2 files changed, 14 insertions, 8 deletions

diff --git a/flake.nix b/flake.nix
index 15483ae..5bba2e9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,8 @@
           mkdir -p $out/share/fonts
           cp ${./ToaqScript.ttf} $out/share/fonts/ToaqScript.ttf
         '';
+        imagemagick' = imagemagick.overrideAttrs
+          (a: { buildInputs = a.buildInputs ++ [ pango ]; });
         schemePkgs = lib.mapAttrs (name:
           { src, install, patches }:
           pkgs.stdenv.mkDerivation {
@@ -58,16 +60,18 @@
           name = "nuogai";
           src = ./.;
           modules = ./gomod2nix.toml;
-          buildInputs = (builtins.attrValues schemePkgs) ++ [
-            toaqScript
-            (imagemagick.overrideAttrs
-              (a: { buildInputs = a.buildInputs ++ [ pango ]; }))
-          ];
+          buildInputs = (builtins.attrValues schemePkgs)
+            ++ [ toaqScript imagemagick' ];
         };
       in {
         defaultPackage = nuogai;
-        packages = schemePkgs // { inherit toaqScript nuogai; };
+        packages = schemePkgs // {
+          inherit toaqScript nuogai;
+          imagemagick = imagemagick';
+        };
         nixosModule = { config, pkgs, lib, ... }@args:
           import ./module.nix (args // { inherit self system; });
-      }) // { inherit (gomod2nix) devShell; };
+      }) // {
+        inherit (gomod2nix) devShell;
+      };
 }
diff --git a/module.nix b/module.nix
index 54881de..f6702dd 100644
--- a/module.nix
+++ b/module.nix
@@ -11,7 +11,8 @@ in with lib; {
       ]);
     tokenPath = mkOption { type = types.path; };
   };
-  config = let enable = cfg.enable; in {
+  config = let enable = cfg.enable;
+  in {
     fonts.fonts = optionals enable [ self.packages.${system}.toaqScript ];
     systemd.services = optionalAttrs enable (mapAttrs (k: v:
       {
@@ -28,6 +29,7 @@ in with lib; {
           };
           script = ''
             export TOKEN=$(cat ${cfg.tokenPath})
+            export PATH+=${self.packages.${system}.imagemagick}/bin
             ${pkg}/bin/nuogai
           '';
         };