deepin.deepin-mutter: remove
Also obsolete.
This commit is contained in:
parent
a18702f37f
commit
d797361cc7
3 changed files with 0 additions and 121 deletions
|
@ -1,41 +0,0 @@
|
||||||
From 8eeb4febcae517080d6638f8953e02335df79f01 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
|
|
||||||
Date: Sat, 20 Apr 2019 00:28:47 -0300
|
|
||||||
Subject: [PATCH] Get plugins dir from environment variable
|
|
||||||
|
|
||||||
---
|
|
||||||
src/compositor/meta-plugin-manager.c | 12 ++++++++++--
|
|
||||||
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c
|
|
||||||
index ac5716db..d000100b 100644
|
|
||||||
--- a/src/compositor/meta-plugin-manager.c
|
|
||||||
+++ b/src/compositor/meta-plugin-manager.c
|
|
||||||
@@ -56,14 +56,22 @@ meta_plugin_manager_set_plugin_type (GType gtype)
|
|
||||||
void
|
|
||||||
meta_plugin_manager_load (const gchar *plugin_name)
|
|
||||||
{
|
|
||||||
- const gchar *dpath = MUTTER_PLUGIN_DIR "/";
|
|
||||||
+ const gchar *env_var;
|
|
||||||
+ const gchar *dpath;
|
|
||||||
gchar *path;
|
|
||||||
MetaModule *module;
|
|
||||||
|
|
||||||
+ env_var = g_getenv ("DEEPIN_MUTTER_PLUGINS_DIR");
|
|
||||||
+ g_debug ("$DEEPIN_MUTTER_PLUGINS_DIR: %s\n", env_var);
|
|
||||||
+
|
|
||||||
+ dpath = env_var == NULL || strlen (env_var) == 0 ? MUTTER_PLUGIN_DIR : env_var;
|
|
||||||
+ g_debug ("dpath: %s\n", dpath);
|
|
||||||
+
|
|
||||||
if (g_path_is_absolute (plugin_name))
|
|
||||||
path = g_strdup (plugin_name);
|
|
||||||
else
|
|
||||||
- path = g_strconcat (dpath, plugin_name, ".so", NULL);
|
|
||||||
+ path = g_strconcat (dpath, "/", plugin_name, ".so", NULL);
|
|
||||||
+ g_debug ("path: %s\n", path);
|
|
||||||
|
|
||||||
module = g_object_new (META_TYPE_MODULE, "path", path, NULL);
|
|
||||||
if (!module || !g_type_module_use (G_TYPE_MODULE (module)))
|
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
|
@ -1,79 +0,0 @@
|
||||||
{ stdenv, fetchFromGitHub, pkgconfig, intltool, libtool, gnome3, gtk3,
|
|
||||||
xorg, libcanberra-gtk3, upower, xkeyboard_config, libxkbcommon,
|
|
||||||
libstartup_notification, libinput, libgudev, cogl, clutter, systemd,
|
|
||||||
gsettings-desktop-schemas, deepin-desktop-schemas, wrapGAppsHook,
|
|
||||||
deepin }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "deepin-mutter";
|
|
||||||
version = "3.20.38";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "linuxdeepin";
|
|
||||||
repo = pname;
|
|
||||||
rev = version;
|
|
||||||
sha256 = "1aq7606sgn2c6n8wfgxdryw3lprc4va0zjc0r65798w5656fdi31";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
pkgconfig
|
|
||||||
intltool
|
|
||||||
libtool
|
|
||||||
gnome3.gnome-common
|
|
||||||
wrapGAppsHook
|
|
||||||
deepin.setupHook
|
|
||||||
];
|
|
||||||
|
|
||||||
buildInputs = [
|
|
||||||
clutter
|
|
||||||
cogl
|
|
||||||
deepin-desktop-schemas
|
|
||||||
gnome3.gnome-desktop
|
|
||||||
gnome3.zenity
|
|
||||||
gsettings-desktop-schemas
|
|
||||||
gtk3
|
|
||||||
libcanberra-gtk3
|
|
||||||
libgudev
|
|
||||||
libinput
|
|
||||||
libstartup_notification
|
|
||||||
libxkbcommon
|
|
||||||
systemd
|
|
||||||
upower
|
|
||||||
xkeyboard_config
|
|
||||||
xorg.libxkbfile
|
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./deepin-mutter.plugins-dir.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
|
||||||
searchHardCodedPaths # debugging
|
|
||||||
sed -i -e "s,Exec=deepin-mutter,Exec=$out/bin/deepin-mutter," data/mutter.desktop.in
|
|
||||||
'';
|
|
||||||
|
|
||||||
configureFlags = [
|
|
||||||
"--enable-native-backend"
|
|
||||||
"--enable-compile-warnings=minimum"
|
|
||||||
];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
|
||||||
'';
|
|
||||||
|
|
||||||
postFixup = ''
|
|
||||||
searchHardCodedPaths $out # debugging
|
|
||||||
'';
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; };
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
description = "Base window manager for deepin, fork of gnome mutter";
|
|
||||||
homepage = https://github.com/linuxdeepin/deepin-mutter;
|
|
||||||
license = licenses.gpl3;
|
|
||||||
platforms = platforms.linux;
|
|
||||||
maintainers = with maintainers; [ romildo ];
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -28,7 +28,6 @@ let
|
||||||
deepin-image-viewer = callPackage ./deepin-image-viewer { };
|
deepin-image-viewer = callPackage ./deepin-image-viewer { };
|
||||||
deepin-menu = callPackage ./deepin-menu { };
|
deepin-menu = callPackage ./deepin-menu { };
|
||||||
deepin-movie-reborn = callPackage ./deepin-movie-reborn { };
|
deepin-movie-reborn = callPackage ./deepin-movie-reborn { };
|
||||||
deepin-mutter = callPackage ./deepin-mutter { };
|
|
||||||
deepin-screenshot = callPackage ./deepin-screenshot { };
|
deepin-screenshot = callPackage ./deepin-screenshot { };
|
||||||
deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
|
deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { };
|
||||||
deepin-sound-theme = callPackage ./deepin-sound-theme { };
|
deepin-sound-theme = callPackage ./deepin-sound-theme { };
|
||||||
|
|
Loading…
Reference in a new issue