colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gammu: 1.33.0 -> 1.38.2

Browse Source
This commit is contained in:
Matt McHenry 2016-11-19 15:24:50 -05:00
parent 08c87eed00
commit 4b77264308
3 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/misc/gammu/bashcomp-dir.patch
View File

@ -1,12 +1,11 @@
diff -Naur gammu-1.33.0.orig/contrib/CMakeLists.txt gammu-1.33.0/contrib/CMakeLists.txt
--- gammu-1.33.0.orig/contrib/CMakeLists.txt 2013-12-26 20:56:22.887772110 +0100
+++ gammu-1.33.0/contrib/CMakeLists.txt 2013-12-26 20:57:04.386276037 +0100
@@ -85,7 +85,7 @@
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -85,7 +85,7 @@ endif (INSTALL_PHP_EXAMPLES)
if (INSTALL_BASH_COMPLETION)
macro_optional_find_package (BashCompletion)
if (NOT BASH_COMPLETION_FOUND)
- set (BASH_COMPLETION_COMPLETIONSDIR "/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
+ set (BASH_COMPLETION_COMPLETIONSDIR "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d" CACHE PATH "Location of bash_completion.d")
endif (NOT BASH_COMPLETION_FOUND)
install (
FILES bash-completion/gammu
- DESTINATION "/etc/bash_completion.d"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/etc/bash_completion.d"
COMPONENT "bash"
)
endif (INSTALL_BASH_COMPLETION)

14
pkgs/applications/misc/gammu/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl
{ stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
, postgresSupport ? false, postgresql ? null
@ -8,14 +8,16 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "gammu-${version}";
version = "1.33.0";
version = "1.38.2";
src = fetchurl {
url = "mirror://sourceforge/project/gammu/gammu/${version}/gammu-${version}.tar.xz";
sha256 = "18gplx1v9d70k1q86d5i4n4dfpx367g34pj3zscppx126vwhv112";
src = fetchFromGitHub {
owner = "gammu";
repo = "gammu";
rev = version;
sha256 = "1rk3p3sjyy6n6mlqs4qgyxna4swrh1zm7b77npxv8j341wxj3khv";
};
patches = [ ./bashcomp-dir.patch ];
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ]
++ optionals dbiSupport [ libdbi libdbiDrivers ]

30
pkgs/applications/misc/gammu/systemd.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in
index 8302353..e3ca59a 100644
--- a/cmake/templates/gammu.spec.in
+++ b/cmake/templates/gammu.spec.in
@@ -387,9 +387,9 @@ fi
%doc %{_mandir}/man7/gammu-smsd-run.7*
%doc %{_mandir}/man7/gammu-smsd-sql.7*
%doc %{_mandir}/man7/gammu-smsd-tables.7*
-%dir %{_libexecdir}/systemd
-%dir %{_libexecdir}/systemd/system
-%{_libexecdir}/systemd/system/gammu-smsd.service
+%dir %{_prefix}/systemd
+%dir %{_prefix}/systemd/system
+%{_prefix}/systemd/system/gammu-smsd.service
%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
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION)
if (WITH_SYSTEMD)
install (
FILES init/gammu-smsd.service
- DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}"
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd"
COMPONENT "systemd"
)
endif (WITH_SYSTEMD)