diff --git a/flake.nix b/flake.nix index bd8888d789d662e5636e099689f054e1fa799a36..5fc7bdbf2121ccee0f300c37a68398dc8f9be7e2 100644 --- a/flake.nix +++ b/flake.nix @@ -13,10 +13,10 @@ }; }; - outputs = inputs@{ flake-parts, ... }: + outputs = inputs @ { self, flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } { imports = [ - ./nix/flake-module.nix + ((import ./nix/flake-module.nix) self) inputs.treefmt-nix.flakeModule ]; systems = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ]; diff --git a/nix/flake-module.nix b/nix/flake-module.nix index b807becf6b25f3f615912a32061594427625700f..09b02ee147fd62ad2986fcbed5353afab56828fa 100644 --- a/nix/flake-module.nix +++ b/nix/flake-module.nix @@ -1,4 +1,4 @@ -{ lib, flake-parts-lib, ... }: +self: { lib, flake-parts-lib, ... }: let inherit (flake-parts-lib) mkPerSystemOption; inherit (lib) types mkOption; @@ -42,7 +42,7 @@ in mainFile = config.document.mainFile; buildCommand = lib.getExe (pkgs.writeShellScriptBin "build-document" '' BUILDDATE="$(TZ='Europe/Budapest' LC_TIME='hu_HU.UTF-8' date +'%Y. %b. %d. %T')" - BUILDCOMMIT="$(git rev-parse --short HEAD || echo '${ if (self' ? rev) then self'.rev else "<ismeretlen>"}')" + BUILDCOMMIT="$(git rev-parse --short HEAD || echo '${ if (self ? shortRev) then self.shortRev else "<ismeretlen>"}')" VARS="\\def\\builddate{$BUILDDATE} \\def\\buildcommit{$BUILDCOMMIT}" latexmk -interaction=nonstopmode -pdf -lualatex \ -outdir="./build" -synctex=1 \