diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 736685f5eb1..1a67163d06c 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with lib; stdenv.mkDerivation rec { pname = "gammu"; - version = "1.40.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf"; + sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I="; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/pkgs/applications/misc/gammu/systemd.patch b/pkgs/applications/misc/gammu/systemd.patch index 22b49a5a2ff..315fd64a3b5 100644 --- a/pkgs/applications/misc/gammu/systemd.patch +++ b/pkgs/applications/misc/gammu/systemd.patch @@ -1,8 +1,8 @@ diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in -index 8302353..e3ca59a 100644 +index 25c08b3d6..86f72d8c7 100644 --- a/cmake/templates/gammu.spec.in +++ b/cmake/templates/gammu.spec.in -@@ -387,9 +387,9 @@ fi +@@ -386,9 +386,9 @@ fi %doc %{_mandir}/man7/gammu-smsd-run.7* %doc %{_mandir}/man7/gammu-smsd-sql.7* %doc %{_mandir}/man7/gammu-smsd-tables.7* @@ -16,13 +16,13 @@ index 8302353..e3ca59a 100644 %files -n libGammu%{so_ver} -f libgammu.lang %defattr(-,root,root,-) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt -index 78cc7fc..d674c36 100644 +index 378411086..b871e6525 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt -@@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION) - if (WITH_SYSTEMD) +@@ -100,7 +100,7 @@ if (WITH_SYSTEMD) + configure_file( init/gammu-smsd.service init/gammu-smsd.service ) install ( - FILES init/gammu-smsd.service + FILES ${CMAKE_CURRENT_BINARY_DIR}/init/gammu-smsd.service - DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}" + DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd" COMPONENT "systemd"