diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 1a67163d06c9..8a33ba3ea3ac 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -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 ]; diff --git a/pkgs/applications/misc/gammu/gammu-config-dialog.patch b/pkgs/applications/misc/gammu/gammu-config-dialog.patch new file mode 100644 index 000000000000..f9f76bfec00b --- /dev/null +++ b/pkgs/applications/misc/gammu/gammu-config-dialog.patch @@ -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