pyrox.dev / nixpkgs
lol
fork atom

gammu: 1.33.0 -> 1.38.2

Matt McHenry 4b772643 08c87eed

+46 -15
unified split
+8 -9
pkgs/applications/misc/gammu/bashcomp-dir.patch
··· 1 - diff -Naur gammu-1.33.0.orig/contrib/CMakeLists.txt gammu-1.33.0/contrib/CMakeLists.txt 2 - --- gammu-1.33.0.orig/contrib/CMakeLists.txt 2013-12-26 20:56:22.887772110 +0100 3 - +++ gammu-1.33.0/contrib/CMakeLists.txt 2013-12-26 20:57:04.386276037 +0100 4 - @@ -85,7 +85,7 @@ 1 + --- a/contrib/CMakeLists.txt 2 + +++ b/contrib/CMakeLists.txt 3 + @@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES) 5 4 if (INSTALL_BASH_COMPLETION) 5 + macro_optional_find_package (BashCompletion) 6 + if (NOT BASH_COMPLETION_FOUND) 7 + - set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") 8 + + set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d") 9 + endif (NOT BASH_COMPLETION_FOUND) 6 10 install ( 7 11 FILES bash-completion/gammu 8 - - DESTINATION "/etc/bash_completion.d" 9 - + DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" 10 - COMPONENT "bash" 11 - ) 12 - endif (INSTALL_BASH_COMPLETION)
+8 -6
pkgs/applications/misc/gammu/default.nix
··· 1 - { stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl 1 + { stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl 2 2 , libiconv, gettext, sqlite 3 3 , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null 4 4 , postgresSupport ? false, postgresql ? null ··· 8 8 9 9 stdenv.mkDerivation rec { 10 10 name = "gammu-${version}"; 11 - version = "1.33.0"; 11 + version = "1.38.2"; 12 12 13 - src = fetchurl { 14 - url = "mirror://sourceforge/project/gammu/gammu/${version}/gammu-${version}.tar.xz"; 15 - sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112"; 13 + src = fetchFromGitHub { 14 + owner = "gammu"; 15 + repo = "gammu"; 16 + rev = version; 17 + sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv"; 16 18 }; 17 19 18 - patches = [ ./bashcomp-dir.patch ]; 20 + patches = [ ./bashcomp-dir.patch ./systemd.patch ]; 19 21 20 22 buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ] 21 23 ++ optionals dbiSupport [ libdbi libdbiDrivers ]
+30
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* 9 + -%dir %{_libexecdir}/systemd 10 + -%dir %{_libexecdir}/systemd/system 11 + -%{_libexecdir}/systemd/system/gammu-smsd.service 12 + +%dir %{_prefix}/systemd 13 + +%dir %{_prefix}/systemd/system 14 + +%{_prefix}/systemd/system/gammu-smsd.service 15 + 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" 29 + ) 30 + endif (WITH_SYSTEMD)