From cbb59aa35435076a19d6c24723e1da9d70584dff Mon Sep 17 00:00:00 2001 From: matt1432 Date: Tue, 31 Dec 2024 14:13:14 -0500 Subject: feat(nix): expose girName with passthru --- nix/mkAstalPkg.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'nix') diff --git a/nix/mkAstalPkg.nix b/nix/mkAstalPkg.nix index 220c261..b0a00af 100644 --- a/nix/mkAstalPkg.nix +++ b/nix/mkAstalPkg.nix @@ -1,5 +1,7 @@ pkgs: let - inherit (builtins) replaceStrings readFile; + inherit (builtins) elem elemAt readFile replaceStrings splitVersion toJSON; + inherit (pkgs.lib) filterAttrs; + readVer = file: replaceStrings ["\n"] [""] (readFile file); toTOML = (pkgs.formats.toml {}).generate; @@ -42,7 +44,7 @@ pkgs: let }; urlmap = pkgs.writeText "urlmap" '' - baseURLs = ${builtins.toJSON [ + baseURLs = ${toJSON [ ["GLib" "https://docs.gtk.org/glib/"] ["GObject" "https://docs.gtk.org/gobject/"] ["Gio" "https://docs.gtk.org/gio/"] @@ -72,6 +74,10 @@ in postUnpack ? "", }: let version = readVer "${src}/version"; + + ver = splitVersion version; + api-ver = "${elemAt ver 0}.${elemAt ver 1}"; + girName = "Astal${gir-suffix}-${api-ver}"; in pkgs.stdenv.mkDerivation { inherit pname src version; @@ -103,13 +109,6 @@ in ''; postInstall = let - inherit (builtins) splitVersion elemAt elem; - inherit (pkgs.lib.attrsets) filterAttrs; - - ver = splitVersion version; - api-ver = "${elemAt ver 0}.${elemAt ver 1}"; - girName = "Astal${gir-suffix}-${api-ver}"; - data = toTOML libname { library = { inherit description authors version; @@ -139,6 +138,10 @@ in mv ${girName}/* $out/share/doc/${website-path} ''; + passthru = { + inherit girName; + }; + meta = { inherit description; homepage = "https://aylur.github.io/astal"; -- cgit v1.2.3