uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- 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}/share/bash-completion/completions" CACHE PATH "Location of bash_completion.d")
endif (NOT BASH_COMPLETION_FOUND)
install (
FILES bash-completion/gammu

View file

@ -0,0 +1,37 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, bluez, libusb1, curl
, libiconv, gettext, sqlite
, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
, postgresSupport ? false, postgresql ? null
}:
with lib;
stdenv.mkDerivation rec {
pname = "gammu";
version = "1.40.0";
src = fetchFromGitHub {
owner = "gammu";
repo = "gammu";
rev = version;
sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf";
};
patches = [ ./bashcomp-dir.patch ./systemd.patch ];
nativeBuildInputs = [ pkg-config cmake ];
strictDeps = true;
buildInputs = [ bluez libusb1 curl gettext sqlite libiconv ]
++ optionals dbiSupport [ libdbi libdbiDrivers ]
++ optionals postgresSupport [ postgresql ];
meta = {
homepage = "https://wammu.eu/gammu/";
description = "Command line utility and library to control mobile phones";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.coroa ];
};
}

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)