From b4ce55c1514e4175cfb464bd6f85f69b9df4c577 Mon Sep 17 00:00:00 2001 From: Brian Nelson Date: Sat, 7 Nov 2026 08:07:54 -0500 Subject: [PATCH] changed cupsadmin --- cli-tools.nix | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/cli-tools.nix b/cli-tools.nix index bc64c68..00b551f 100644 --- a/cli-tools.nix +++ b/cli-tools.nix @@ -1,19 +1,24 @@ -{ inputs, ... }: +{ inputs, pkgs, ... }: + +let + cupsadminPkg = pkgs.fetchurl { + url = "https://github.com/kfattic/cupsadmin/releases/download/v1.4.1/cupsadmin-1.4.1.pkg"; + hash = "sha256-DyIyDYSjAlcU7ivyfldMapIZw5nczEBXfnLicnK6k7Y="; + }; +in { system.activationScripts.postActivation.text = '' - stamp=/usr/local/share/cupsadmin.stamp - want="${inputs.cupsadmin}" + want="${cupsadminPkg}" + stamp=/usr/local/share/cupsadmin-pkg.stamp if [ "$(cat "$stamp" 2>/dev/null)" != "$want" ]; then - echo "building cupsadmin..." - tmp=$(mktmp -d) - cp -R "$want"/. "$tmp" - chmod -R u+w "$tmp" - ( cd "$tmp" && /user/bin/swift build -c release ) \ - && install -m 755 "$tmp/.build/release/cupsadmin" /usr/local/bin/cupsadmin \ - && mkdir -p /usr/local/share && echo #$want" > "$stamp" \ - || echo "cupsadmin build failed, skipping" - rm -rf "$tmp" + echo "installing cupsadmin..." + if /usr/sbin/installer -pkg "$want" -target /; then + mkdir -p /usr/local/share + echo "$want" > "$stamp" + else + echo "cupsadmin install failed, skipping" + fi fi '';