From 90b59a31316e0a171d986763494851e4c66b6579 Mon Sep 17 00:00:00 2001 From: uakci Date: Fri, 13 May 2022 22:52:49 +0200 Subject: force-add imagemagick to PATH? --- flake.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 36d3918..731d0d2 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ mkdir -p $out/share/fonts cp ${./ToaqScript.ttf} $out/share/fonts/ToaqScript.ttf ''; - imagemagick' = imagemagick.overrideAttrs + imagemagickWithPango = imagemagick.overrideAttrs (a: { buildInputs = a.buildInputs ++ [ pango ]; }); schemePkgs = lib.mapAttrs (name: { src, install, patches }: @@ -59,14 +59,18 @@ name = "nuogai"; src = ./.; modules = ./gomod2nix.toml; - propagatedBuildInputs = (builtins.attrValues schemePkgs) - ++ [ toaqScript imagemagick' ]; + buildInputs = builtins.attrValues schemePkgs; + nativeBuildInputs = [ makeWrapper ]; + postFixup = '' + wrapProgram $out/bin/nuogai --prefix PATH : ${ + lib.makeBinPath [ imagemagickWithPango ] + } + ''; }; in { defaultPackage = nuogai; packages = schemePkgs // { - inherit toaqScript nuogai; - imagemagickWithPango = imagemagick'; + inherit toaqScript nuogai imagemagickWithPango; }; nixosModule = { config, pkgs, lib, ... }@args: import ./module.nix (args // { inherit self system; }); -- cgit v1.2.3