aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/desktops/deepin/dde-polkit-agent')
-rw-r--r--nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch42
-rw-r--r--nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix60
2 files changed, 0 insertions, 102 deletions
diff --git a/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
deleted file mode 100644
index a6941e975eb..00000000000
--- a/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 4f457d38e9e75bc97ee7dba633bf0cdd61b8cd5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
-Date: Fri, 19 Apr 2019 22:01:16 -0300
-Subject: [PATCH] Use an environment variable to find plugins
-
----
- pluginmanager.cpp | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/pluginmanager.cpp b/pluginmanager.cpp
-index 0c03237..79bdf86 100644
---- a/pluginmanager.cpp
-+++ b/pluginmanager.cpp
-@@ -34,13 +34,19 @@ QList<QButtonGroup*> PluginManager::reduceGetOptions(const QString &actionID)
- void PluginManager::load()
- {
-
-- QDir dir("/usr/lib/polkit-1-dde/plugins/");
-- QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so")));
-+ QStringList pluginsDirs = QProcessEnvironment::systemEnvironment().value("DDE_POLKIT_PLUGINS_DIRS").split(QDir::listSeparator(), QString::SkipEmptyParts);
-+ pluginsDirs.append("/usr/lib/polkit-1-dde/plugins/");
-
-- for (const QFileInfo &pluginFile : pluginFiles) {
-- AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath());
-- if (plugin)
-- m_plugins << plugin;
-+ for (const QString &dirName : pluginsDirs) {
-+ QDir dir(dirName);
-+
-+ QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so")));
-+
-+ for (const QFileInfo &pluginFile : pluginFiles) {
-+ AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath());
-+ if (plugin)
-+ m_plugins << plugin;
-+ }
- }
- }
-
---
-2.21.0
-
diff --git a/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix
deleted file mode 100644
index 1ca9a80abaf..00000000000
--- a/nixpkgs/pkgs/desktops/deepin/dde-polkit-agent/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ stdenv
-, mkDerivation
-, fetchFromGitHub
-, pkgconfig
-, qmake
-, qttools
-, polkit-qt
-, dtkcore
-, dtkwidget
-, dde-qt-dbus-factory
-, deepin
-}:
-
-mkDerivation rec {
- pname = "dde-polkit-agent";
- version = "5.0.0";
-
- src = fetchFromGitHub {
- owner = "linuxdeepin";
- repo = pname;
- rev = version;
- sha256 = "00p8syx6rfwhq7wdsk37hm9mvwd0kwj9h0s39hii892h1psd84q9";
- };
-
- nativeBuildInputs = [
- pkgconfig
- qmake
- qttools
- deepin.setupHook
- ];
-
- buildInputs = [
- dde-qt-dbus-factory
- dtkcore
- dtkwidget
- polkit-qt
- ];
-
- postPatch = ''
- searchHardCodedPaths
- patchShebangs translate_generation.sh
-
- fixPath $out /usr dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop
- fixPath /run/current-system/sw /usr/lib/polkit-1-dde/plugins pluginmanager.cpp
- '';
-
- postFixup = ''
- searchHardCodedPaths $out
- '';
-
- passthru.updateScript = deepin.updateScript { inherit pname version src; };
-
- meta = with stdenv.lib; {
- description = "PolicyKit agent for Deepin Desktop Environment";
- homepage = "https://github.com/linuxdeepin/dde-polkit-agent";
- license = licenses.gpl3;
- platforms = platforms.linux;
- maintainers = with maintainers; [ romildo ];
- };
-}