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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,25 @@
|
|||
From bbd366348d1f0e334d4604d04e293a046070e666 Mon Sep 17 00:00:00 2001
|
||||
From: Maximilian Bosch <maximilian@mbosch.me>
|
||||
Date: Fri, 23 Aug 2019 00:19:20 +0200
|
||||
Subject: [PATCH] Explicitly copy dbus files into the store dir
|
||||
|
||||
---
|
||||
shell_integration/libcloudproviders/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt
|
||||
index 1f35335..7f76951 100644
|
||||
--- a/shell_integration/libcloudproviders/CMakeLists.txt
|
||||
+++ b/shell_integration/libcloudproviders/CMakeLists.txt
|
||||
@@ -19,7 +19,7 @@ MACRO(PKGCONFIG_GETVAR _package _var _output_variable)
|
||||
ENDMACRO(PKGCONFIG_GETVAR _package _var _output_variable)
|
||||
|
||||
macro(dbus_add_activation_service _sources)
|
||||
- PKGCONFIG_GETVAR(dbus-1 session_bus_services_dir _install_dir)
|
||||
+ set(_install_dir "${CMAKE_INSTALL_DATADIR}/dbus-1/service")
|
||||
foreach (_i ${_sources})
|
||||
get_filename_component(_service_file ${_i} ABSOLUTE)
|
||||
string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
|
||||
--
|
||||
2.19.2
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
From 54255deceaaaf118e9daadc3dd9f517c33bdd658 Mon Sep 17 00:00:00 2001
|
||||
From: Ilan Joselevich <personal@ilanjoselevich.com>
|
||||
Date: Tue, 30 Nov 2021 22:50:43 +0200
|
||||
Subject: [PATCH] When creating the autostart entry, do not use an absolute
|
||||
|
||||
---
|
||||
src/common/utility_unix.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/common/utility_unix.cpp b/src/common/utility_unix.cpp
|
||||
index 887213f09..c66468306 100644
|
||||
--- a/src/common/utility_unix.cpp
|
||||
+++ b/src/common/utility_unix.cpp
|
||||
@@ -88,7 +88,7 @@ void setLaunchOnStartup_private(const QString &appName, const QString &guiName,
|
||||
ts << QLatin1String("[Desktop Entry]\n")
|
||||
<< QLatin1String("Name=") << guiName << QLatin1Char('\n')
|
||||
<< QLatin1String("GenericName=") << QLatin1String("File Synchronizer\n")
|
||||
- << QLatin1String("Exec=\"") << executablePath << "\" --background\n"
|
||||
+ << QLatin1String("Exec=") << "nextcloud --background" << endl
|
||||
<< QLatin1String("Terminal=") << "false\n"
|
||||
<< QLatin1String("Icon=") << APPLICATION_ICON_NAME << QLatin1Char('\n')
|
||||
<< QLatin1String("Categories=") << QLatin1String("Network\n")
|
||||
--
|
||||
2.33.1
|
||||
102
pkgs/applications/networking/nextcloud-client/default.nix
Normal file
102
pkgs/applications/networking/nextcloud-client/default.nix
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, inotify-tools
|
||||
, installShellFiles
|
||||
, libcloudproviders
|
||||
, librsvg
|
||||
, libsecret
|
||||
, openssl
|
||||
, pcre
|
||||
, pkg-config
|
||||
, qtbase
|
||||
, qtkeychain
|
||||
, qttools
|
||||
, qtwebengine
|
||||
, qtwebsockets
|
||||
, qtquickcontrols2
|
||||
, qtgraphicaleffects
|
||||
, plasma5Packages
|
||||
, sphinx
|
||||
, sqlite
|
||||
, xdg-utils
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "nextcloud-client";
|
||||
version = "3.5.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextcloud";
|
||||
repo = "desktop";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-/Bz3vkV4+ZFlGBNtkLIGsBk51a3wxy32U1KYcA3awcw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Explicitly move dbus configuration files to the store path rather than `/etc/dbus-1/services`.
|
||||
./0001-Explicitly-copy-dbus-files-into-the-store-dir.patch
|
||||
./0001-When-creating-the-autostart-entry-do-not-use-an-abso.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
for file in src/libsync/vfs/*/CMakeLists.txt; do
|
||||
substituteInPlace $file \
|
||||
--replace "PLUGINDIR" "KDE_INSTALL_PLUGINDIR"
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cmake
|
||||
extra-cmake-modules
|
||||
librsvg
|
||||
sphinx
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
inotify-tools
|
||||
libcloudproviders
|
||||
libsecret
|
||||
openssl
|
||||
pcre
|
||||
plasma5Packages.kio
|
||||
qtbase
|
||||
qtkeychain
|
||||
qttools
|
||||
qtwebengine
|
||||
qtquickcontrols2
|
||||
qtgraphicaleffects
|
||||
qtwebsockets
|
||||
sqlite
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libsecret ]}"
|
||||
# See also: https://bugreports.qt.io/browse/QTBUG-85967
|
||||
"--set QML_DISABLE_DISK_CACHE 1"
|
||||
"--prefix PATH : ${lib.makeBinPath [ xdg-utils ]}"
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib" # expected to be prefix-relative by build code setting RPATH
|
||||
"-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
make doc-man
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nextcloud themed desktop client";
|
||||
homepage = "https://nextcloud.com";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ kranzes SuperSandro2000 ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "nextcloud";
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue