gammu: fix script dependencies on bash and dialog

This commit is contained in:
Markus S. Wamser 2022-11-04 23:07:35 +01:00
parent 250e6c244f
commit 8dc7d564aa
2 changed files with 31 additions and 4 deletions

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite
{ lib, stdenv, fetchFromGitHub, substituteAll, pkg-config, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite, bash, dialog
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
, postgresSupport ? false, postgresql ? null
}:
@ -17,13 +17,20 @@ stdenv.mkDerivation rec {
sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I=";
};
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
patches = [
./bashcomp-dir.patch
./systemd.patch
(substituteAll {
src = ./gammu-config-dialog.patch;
dialog = "${dialog}/bin/dialog";
})
];
nativeBuildInputs = [ pkg-config cmake ];
strictDeps = true;
buildInputs = [ bluez libusb1 curl gettext sqlite libiconv ]
buildInputs = [ bash bluez libusb1 curl gettext sqlite libiconv ]
++ optionals dbiSupport [ libdbi libdbiDrivers ]
++ optionals postgresSupport [ postgresql ];

View File

@ -0,0 +1,20 @@
--- a/utils/gammu-config
+++ b/utils/gammu-config
@@ -59,16 +59,7 @@
shift
done
-if type dialog > /dev/null 2>&1 ; then
- DIALOG=dialog
-elif type cdialog > /dev/null 2>&1 ; then
- DIALOG=cdialog
-elif type whiptail > /dev/null 2>&1 ; then
- DIALOG=whiptail
-else
- echo "You need dialog, cdialog or whiptail installed to make this work"
- exit 1
-fi
+DIALOG=@dialog@
if [ -f "$CONFIG" ] ; then
if [ ! -w "$CONFIG" ] ; then