From 132e15cb9f1f0052117c581ed34f6bb1b6ff5bac Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 7 Aug 2023 04:29:38 +0000 Subject: [PATCH] sxmo-utils: switch runtime shell back to bash, but still use busybux during build no need to patch it out of the build process --- pkgs/additional/sxmo-utils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/additional/sxmo-utils/default.nix b/pkgs/additional/sxmo-utils/default.nix index 4904d22c..ee01cd8f 100644 --- a/pkgs/additional/sxmo-utils/default.nix +++ b/pkgs/additional/sxmo-utils/default.nix @@ -1,4 +1,5 @@ { stdenv +, bash , bc , bemenu , bonsai @@ -42,14 +43,13 @@ let # anything which any sxmo script or default hook in this package might invoke runtimeDeps = [ - # bc # busybox + bc # also in busybox bemenu bonsai - busybox # sxmo targets busybox, which differs from non-busybox utilities in subtle ways (e.g. `pidof` behavior) conky dbus # dmenu # or dmenu-wayland? only used on x11? - # gnugrep # busybox + gnugrep # also in busybox gojq grim inotify-tools @@ -162,7 +162,7 @@ stdenv.mkDerivation rec { scdoc ]; - buildInputs = [ busybox ]; # needed here so stdenv's `patchShebangsAuto` hook sets the right interpreter + buildInputs = [ bash ]; # needed here so stdenv's `patchShebangsAuto` hook sets the right interpreter installPhase = '' runHook preInstall