Unverified Commit 85d6b399 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #199581 from wamserma/fix-gammu

parents 54d6004e 8dc7d564
Loading
Loading
Loading
Loading
+11 −4
Original line number Diff line number Diff line
{ 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 ];

+20 −0
Original line number Diff line number Diff line
--- 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