gammu: 1.40.0 -> 1.42.0

authored by

kilianar and committed by
Bjørn Forsman
026ab5c8 af4f49d3

+8 -8
+2 -2
pkgs/applications/misc/gammu/default.nix
··· 8 9 stdenv.mkDerivation rec { 10 pname = "gammu"; 11 - version = "1.40.0"; 12 13 src = fetchFromGitHub { 14 owner = "gammu"; 15 repo = "gammu"; 16 rev = version; 17 - sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf"; 18 }; 19 20 patches = [ ./bashcomp-dir.patch ./systemd.patch ];
··· 8 9 stdenv.mkDerivation rec { 10 pname = "gammu"; 11 + version = "1.42.0"; 12 13 src = fetchFromGitHub { 14 owner = "gammu"; 15 repo = "gammu"; 16 rev = version; 17 + sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I="; 18 }; 19 20 patches = [ ./bashcomp-dir.patch ./systemd.patch ];
+6 -6
pkgs/applications/misc/gammu/systemd.patch
··· 1 diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in 2 - index 8302353..e3ca59a 100644 3 --- a/cmake/templates/gammu.spec.in 4 +++ b/cmake/templates/gammu.spec.in 5 - @@ -387,9 +387,9 @@ fi 6 %doc %{_mandir}/man7/gammu-smsd-run.7* 7 %doc %{_mandir}/man7/gammu-smsd-sql.7* 8 %doc %{_mandir}/man7/gammu-smsd-tables.7* ··· 16 %files -n libGammu%{so_ver} -f libgammu.lang 17 %defattr(-,root,root,-) 18 diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt 19 - index 78cc7fc..d674c36 100644 20 --- a/contrib/CMakeLists.txt 21 +++ b/contrib/CMakeLists.txt 22 - @@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION) 23 - if (WITH_SYSTEMD) 24 install ( 25 - FILES init/gammu-smsd.service 26 - DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}" 27 + DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd" 28 COMPONENT "systemd"
··· 1 diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in 2 + index 25c08b3d6..86f72d8c7 100644 3 --- a/cmake/templates/gammu.spec.in 4 +++ b/cmake/templates/gammu.spec.in 5 + @@ -386,9 +386,9 @@ fi 6 %doc %{_mandir}/man7/gammu-smsd-run.7* 7 %doc %{_mandir}/man7/gammu-smsd-sql.7* 8 %doc %{_mandir}/man7/gammu-smsd-tables.7* ··· 16 %files -n libGammu%{so_ver} -f libgammu.lang 17 %defattr(-,root,root,-) 18 diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt 19 + index 378411086..b871e6525 100644 20 --- a/contrib/CMakeLists.txt 21 +++ b/contrib/CMakeLists.txt 22 + @@ -100,7 +100,7 @@ if (WITH_SYSTEMD) 23 + configure_file( init/gammu-smsd.service init/gammu-smsd.service ) 24 install ( 25 + FILES ${CMAKE_CURRENT_BINARY_DIR}/init/gammu-smsd.service 26 - DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}" 27 + DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd" 28 COMPONENT "systemd"