diff --git a/pkgs/development/tools/ofono-phonesim/default.nix b/pkgs/development/tools/ofono-phonesim/default.nix index cc33b675954a..e62827c67b49 100644 --- a/pkgs/development/tools/ofono-phonesim/default.nix +++ b/pkgs/development/tools/ofono-phonesim/default.nix @@ -1,27 +1,21 @@ { stdenv , mkDerivation -, fetchFromGitHub +, fetchgit , autoreconfHook , pkgconfig , qtbase -, qtscript }: mkDerivation { pname = "ofono-phonesim"; - version = "unstable-2014-04-22"; + version = "unstable-2019-11-18"; - src = fetchFromGitHub { - owner = "jpakkane"; - repo = "ofono-phonesim"; - rev = "baa41f04e6a86c5289d7185cad8a6f08a5c3ed0a"; - sha256 = "0ywalvvf3dfbn81ml21gji1n2hywh2nmakynakjzyyskcqjn2wiz"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/ofono/phonesim.git"; + rev = "adf231a84cd3708b825dc82c56e841dd7e3b4541"; + sha256 = "sha256:1840914sz46l8h2jwa0lymw6dvgj72wq9bhp3k4v4rk6masbf6hp"; }; - patches = [ - ./qt5-compat.patch - ]; - nativeBuildInputs = [ autoreconfHook pkgconfig @@ -29,7 +23,6 @@ mkDerivation { buildInputs = [ qtbase - qtscript ]; makeFlags = [ @@ -39,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Phone Simulator for modem testing"; - homepage = https://github.com/jpakkane/ofono-phonesim; + homepage = "https://01.org/ofono"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch b/pkgs/development/tools/ofono-phonesim/qt5-compat.patch deleted file mode 100644 index e2e9dcebd6bc..000000000000 --- a/pkgs/development/tools/ofono-phonesim/qt5-compat.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 2436292..993df87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,18 +21,18 @@ AC_ARG_ENABLE(optimization, AC_HELP_STRING([--disable-optimization], - fi - ]) - --PKG_CHECK_MODULES(QT, QtCore QtGui QtXml QtNetwork QtScript QtDBus, dummy=yes, -+PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5Script Qt5DBus, dummy=yes, - AC_MSG_ERROR(Qt is required)) - AC_SUBST(QT_CFLAGS) - AC_SUBST(QT_LIBS) - - AC_MSG_CHECKING(for moc) --MOC="`$PKG_CONFIG --variable=moc_location QtCore`" -+MOC="`$PKG_CONFIG --variable=moc_location Qt5Core`" - AC_SUBST(MOC) - AC_MSG_RESULT($MOC) - - AC_MSG_CHECKING(for uic) --UIC="`$PKG_CONFIG --variable=uic_location QtCore`" -+UIC="`$PKG_CONFIG --variable=uic_location Qt5Core`" - AC_SUBST(UIC) - AC_MSG_RESULT($UIC) - -diff --git a/src/control.cpp b/src/control.cpp -index e1838a6..880da68 100644 ---- a/src/control.cpp -+++ b/src/control.cpp -@@ -22,7 +22,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #define TWO_BYTE_MAX 65535 - #define FOUR_CHAR 4