From ed3eda7c718f9dbc9f7b6ac7bd6b3a1b1ff0e662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B7=F0=90=91=91=F0=90=91=B4=F0=90=91=95=F0=90=91=91?= =?UTF-8?q?=F0=90=91=A9=F0=90=91=A4?= Date: Sat, 21 Mar 2026 22:24:23 +0700 Subject: [PATCH] nixtamal: rework outputs --- pkgs/by-name/ni/nixtamal/package.nix | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index 904b19f8d32f..03bfb4a770ce 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -80,17 +80,32 @@ ocamlPackages.buildDunePackage (finalAttrs: { outputs = [ "bin" + "data" + "doc" "lib" + "man" "out" ]; installPhase = '' runHook preInstall - dune install --prefix="$bin" --libdir="$lib/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib" nixtamal - for dep in ${ocamlPackages.ocaml} ${ocamlPackages.camomile} + + dune install \ + -j "$NIX_BUILD_CORES" \ + --cache="disabled" \ + --prefix="$out" \ + --bindir="$bin/bin" \ + --datadir="$data/share" \ + --docdir="$doc/share/doc" \ + --mandir="$man/share/man" \ + --libdir="$lib/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib" \ + nixtamal + + for dep in "${ocamlPackages.ocaml}" "${ocamlPackages.camomile}" do - remove-references-to -t $dep $bin/bin/nixtamal + remove-references-to -t "$dep" "$bin/bin/nixtamal" done + wrapProgram "$bin/bin/nixtamal" --prefix PATH : ${ lib.makeBinPath [ coreutils @@ -100,6 +115,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { nix-prefetch-pijul ] } + runHook postInstall ''; @@ -112,6 +128,12 @@ ocamlPackages.buildDunePackage (finalAttrs: { license = with lib.licenses; [ gpl3Plus ]; platforms = lib.platforms.unix; mainProgram = "nixtamal"; + outputsToInstall = [ + "bin" + "data" + "doc" + "man" + ]; homepage = "https://nixtamal.toast.al"; changelog = "https://nixtamal.toast.al/changelog/"; description = "Fulfilling input pinning for Nix";