summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruakci <uakci@uakci.pl>2022-05-13 22:30:14 +0200
committeruakci <uakci@uakci.pl>2022-05-13 22:30:14 +0200
commit7786e7c9992ca04f7b0d9335ae05eae52a912c28 (patch)
treee81a50391185003ebbb8dde16010358ae338432b
parentdirty fix for imagemagick not showing up in $PATH (diff)
downloadnuogai-7786e7c9992ca04f7b0d9335ae05eae52a912c28.tar.gz
nuogai-7786e7c9992ca04f7b0d9335ae05eae52a912c28.zip
try 2
-rw-r--r--flake.nix4
-rw-r--r--module.nix1
2 files changed, 2 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index 5bba2e9..5344a4a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -60,14 +60,14 @@
name = "nuogai";
src = ./.;
modules = ./gomod2nix.toml;
- buildInputs = (builtins.attrValues schemePkgs)
+ propagatedBuildInputs = (builtins.attrValues schemePkgs)
++ [ toaqScript imagemagick' ];
};
in {
defaultPackage = nuogai;
packages = schemePkgs // {
inherit toaqScript nuogai;
- imagemagick = imagemagick';
+ imagemagickWithPango = imagemagick';
};
nixosModule = { config, pkgs, lib, ... }@args:
import ./module.nix (args // { inherit self system; });
diff --git a/module.nix b/module.nix
index f6702dd..311ee29 100644
--- a/module.nix
+++ b/module.nix
@@ -29,7 +29,6 @@ in with lib; {
};
script = ''
export TOKEN=$(cat ${cfg.tokenPath})
- export PATH+=${self.packages.${system}.imagemagick}/bin
${pkg}/bin/nuogai
'';
};