From fd8e2f705629729881f09b319959d777becfec83 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Mon, 14 Apr 2025 11:45:48 +0200 Subject: pkgs/brightness: Migrate to `writeShellApplication` --- pkgs/by-name/br/brightness/brightness.sh | 26 +++++++++----------------- pkgs/by-name/br/brightness/package.nix | 20 +++++++++++++------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/br/brightness/brightness.sh b/pkgs/by-name/br/brightness/brightness.sh index 887dbb1e..3d6b2335 100755 --- a/pkgs/by-name/br/brightness/brightness.sh +++ b/pkgs/by-name/br/brightness/brightness.sh @@ -1,24 +1,23 @@ -#!/usr/bin/env dash +#!/usr/bin/env sh -# shellcheck source=/dev/null -SHELL_LIBRARY_VERSION="2.1.2" . %SHELL_LIBRARY_PATH +die() { + echo "ERROR: $1" + exit 1 +} help() { cat <"$BACKLIGHT/brightness" } @@ -47,10 +43,6 @@ for arg in "$@"; do help exit 0 ;; - "--version" | "-v") - version - exit 0 - ;; esac done diff --git a/pkgs/by-name/br/brightness/package.nix b/pkgs/by-name/br/brightness/package.nix index c2e31a0c..7d9d2194 100644 --- a/pkgs/by-name/br/brightness/package.nix +++ b/pkgs/by-name/br/brightness/package.nix @@ -1,14 +1,20 @@ { - sysLib, + writeShellApplication, + # Arguments backlightName ? "intel_backlight", # nixosConfig.soispha.laptop.backlight + # Dependencies + gawk, + coreutils, }: -sysLib.writeShellScript { +writeShellApplication { name = "brightness"; - src = ./brightness.sh; - generateCompletions = true; - keepPath = false; + text = builtins.readFile ./brightness.sh; + inheritPath = false; - replacementStrings = {BACKLIGHT_NAME = backlightName;}; + runtimeEnv = {BACKLIGHT_NAME = backlightName;}; - dependencies = []; + runtimeInputs = [ + gawk + coreutils + ]; } -- cgit 1.4.1