cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

budgie.budgie-desktop: 10.8 -> 10.8.1

Browse source 
https://buddiesofbudgie.org/blog/budgie-10-8-1-released
https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.8.1

Signed-off-by: Federico Damián Schonborn <fdschonborn@gmail.com>
This commit is contained in:
Federico Damián Schonborn 2023-10-01 20:22:06 -03:00
parent 6500b4580c
commit 4974701f12
No known key found for this signature in database
GPG key ID: F3F89A1BBF9D13D9
2 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/budgie/budgie-desktop/default.nix
View file

@ -37,14 +37,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "budgie-desktop"; pname = "budgie-desktop";
version = "10.8"; version = "10.8.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "BuddiesOfBudgie"; owner = "BuddiesOfBudgie";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-fOsTBnKtwBGQSPkBBrzwHEB3+OcJYtPIdvZsV31oi6g="; hash = "sha256-KhCQ5v6R6sS5Vjl10QhSuAxAPTDDAvJ6uu6VKTdX7m4=";
}; };
patches = [ patches = [

48
pkgs/desktops/budgie/budgie-desktop/plugins.patch
View file

@ -1,5 +1,5 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index 48aeeb38..31e4c24b 100644 index 6c6e473e..9b8fb73a 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir')) @@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir'))
@ -43,7 +43,7 @@ index 48aeeb38..31e4c24b 100644
with_bluetooth = get_option('with-bluetooth') with_bluetooth = get_option('with-bluetooth')
if with_bluetooth == true if with_bluetooth == true
diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c
index fc531f59..0a21b690 100644 index 3ffe3632..da53e054 100644
--- a/src/config/budgie-config.c --- a/src/config/budgie-config.c
+++ b/src/config/budgie-config.c +++ b/src/config/budgie-config.c
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
@ -51,14 +51,13 @@ index fc531f59..0a21b690 100644
#ifndef CONFIG_H_INCLUDED #ifndef CONFIG_H_INCLUDED
#include "config.h" #include "config.h"
-#include <stdbool.h> -#include <stdbool.h>
#include <stddef.h>
/** /**
* All this is to keep Vala happy & configured.. @@ -22,20 +21,6 @@ const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR;
@@ -20,21 +19,6 @@ const char* BUDGIE_MODULE_DIRECTORY = MODULEDIR;
const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR;
const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR; const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR;
const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR; const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR;
-
-#ifdef HAS_SECONDARY_PLUGIN_DIRS -#ifdef HAS_SECONDARY_PLUGIN_DIRS
-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true; -const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true;
-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY; -const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY;
@ -68,28 +67,27 @@ index fc531f59..0a21b690 100644
-#else -#else
-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false; -const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false;
-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL; -const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL;
-const char* BUDGIE_MODULE_DATA_DIRECTORY = NULL; -const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = NULL;
-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = NULL; -const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = NULL;
-const char* BUDGIE_RAVEN_PLUGIN_DATADIR = NULL; -const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = NULL;
-#endif -#endif
- -
const char* BUDGIE_DATADIR = DATADIR; const char* BUDGIE_DATADIR = DATADIR;
const char* BUDGIE_VERSION = PACKAGE_VERSION; const char* BUDGIE_VERSION = PACKAGE_VERSION;
const char* BUDGIE_WEBSITE = PACKAGE_URL; const char* BUDGIE_WEBSITE = PACKAGE_URL;
diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h
index 720379a5..c5774820 100644 index b7581203..11df4347 100644
--- a/src/config/budgie-config.h --- a/src/config/budgie-config.h
+++ b/src/config/budgie-config.h +++ b/src/config/budgie-config.h
@@ -12,8 +12,6 @@ @@ -12,7 +12,6 @@
#ifndef _BUDGIE_CONFIG_H_ #ifndef _BUDGIE_CONFIG_H_
#define _BUDGIE_CONFIG_H_ #define _BUDGIE_CONFIG_H_
-#include <stdbool.h> -#include <stdbool.h>
- #include <stddef.h>
/* i.e. /usr/lib/budgie-desktop */
extern const char* BUDGIE_MODULE_DIRECTORY;
@@ -26,12 +24,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR; /* i.e. /usr/lib/budgie-desktop */
@@ -27,12 +26,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR;
/* i.e. /usr/share/budgie-desktop/raven-plugins */ /* i.e. /usr/share/budgie-desktop/raven-plugins */
extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR; extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR;
@ -129,7 +127,7 @@ index 5eb445d1..7d27e348 100644
public extern const string DATADIR; public extern const string DATADIR;
diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala
index f4f2e4da..9d569bd1 100644 index f4f2e4da..3dfee49a 100644
--- a/src/panel/plugin_manager.vala --- a/src/panel/plugin_manager.vala
+++ b/src/panel/plugin_manager.vala +++ b/src/panel/plugin_manager.vala
@@ -40,13 +40,26 @@ namespace Budgie { @@ -40,13 +40,26 @@ namespace Budgie {
@ -146,16 +144,16 @@ index f4f2e4da..9d569bd1 100644
+ } else { + } else {
+ debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY); + debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY);
+ libdir = Budgie.MODULE_DIRECTORY; + libdir = Budgie.MODULE_DIRECTORY;
} + }
+
+ var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR"); + var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR");
+ if (datadir != null) { + if (datadir != null) {
+ debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir); + debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
+ } else { + } else {
+ debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY); + debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY);
+ datadir = Budgie.MODULE_DATA_DIRECTORY; + datadir = Budgie.MODULE_DATA_DIRECTORY;
+ } }
+
+ engine.add_search_path(libdir, datadir); + engine.add_search_path(libdir, datadir);
+ +
/* User path */ /* User path */
@ -164,7 +162,7 @@ index f4f2e4da..9d569bd1 100644
var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data"); var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data");
engine.add_search_path(user_mod, hdata); engine.add_search_path(user_mod, hdata);
diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala
index 01f32553..d671109a 100644 index 01f32553..2826b7e5 100644
--- a/src/raven/plugin_manager.vala --- a/src/raven/plugin_manager.vala
+++ b/src/raven/plugin_manager.vala +++ b/src/raven/plugin_manager.vala
@@ -51,13 +51,26 @@ namespace Budgie { @@ -51,13 +51,26 @@ namespace Budgie {
@ -181,16 +179,16 @@ index 01f32553..d671109a 100644
+ } else { + } else {
+ debug("RAVEN_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_LIBDIR); + debug("RAVEN_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_LIBDIR);
+ libdir = Budgie.RAVEN_PLUGIN_LIBDIR; + libdir = Budgie.RAVEN_PLUGIN_LIBDIR;
+ } }
+
+ var datadir = Environment.get_variable("RAVEN_PLUGIN_DATADIR"); + var datadir = Environment.get_variable("RAVEN_PLUGIN_DATADIR");
+ if (datadir != null) { + if (datadir != null) {
+ debug("RAVEN_PLUGIN_DATADIR is set to %s", datadir); + debug("RAVEN_PLUGIN_DATADIR is set to %s", datadir);
+ } else { + } else {
+ debug("RAVEN_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_DATADIR); + debug("RAVEN_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_DATADIR);
+ datadir = Budgie.RAVEN_PLUGIN_DATADIR; + datadir = Budgie.RAVEN_PLUGIN_DATADIR;
} + }
+
+ engine.add_search_path(libdir, datadir); + engine.add_search_path(libdir, datadir);
+ +
/* User path */ /* User path */