pyrox.dev
guake: 3.9.0 → 3.10
https://github.com/Guake/guake/releases/tag/3.10
https://github.com/Guake/guake/compare/3.9.0...3.10
+35
-5
pkgs/applications/terminal-emulators/guake/default.nix
+35
-5
pkgs/applications/terminal-emulators/guake/default.nix
···
1
1
{ lib
2
2
, fetchFromGitHub
3
+
, fetchpatch
3
4
, python3
4
5
, glibcLocales
5
6
, gobject-introspection
···
10
11
, libutempter
11
12
, vte
12
13
, libwnck
14
+
, dconf
13
15
, nixosTests
14
16
}:
15
17
16
18
python3.pkgs.buildPythonApplication rec {
17
19
pname = "guake";
18
-
version = "3.9.0";
20
+
version = "3.10";
19
21
20
-
format = "other";
22
+
pyproject = false;
21
23
22
24
src = fetchFromGitHub {
23
25
owner = "Guake";
24
26
repo = "guake";
25
27
rev = "refs/tags/${version}";
26
-
sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU=";
28
+
hash = "sha256-e6Bf4HDftHBxFPcw9z02CqgZhSIvt6wlLF6dnIh9fEc=";
27
29
};
28
30
31
+
patches = [
32
+
# Avoid trying to recompile schema at runtime,
33
+
# the package should be responsible for ensuring it is up to date.
34
+
# Without this, the package will try to run glib-compile-schemas
35
+
# on every update, which is pointless and will crash
36
+
# unless user has it installed.
37
+
./no-compile-schemas.patch
38
+
39
+
# Avoid using pip since it fails on not being able to find setuptools.
40
+
# Note: This is not a long-term solution, setup.py is deprecated.
41
+
(fetchpatch {
42
+
url = "https://github.com/Guake/guake/commit/14abaa0c69cfab64fe3467fbbea211d830042de8.patch";
43
+
hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY= ";
44
+
revert = true;
45
+
})
46
+
47
+
# Revert switch to FHS.
48
+
(fetchpatch {
49
+
url = "https://github.com/Guake/guake/commit/8c7a23ba62ee262c033dfa5b0b18d3df71361ff4.patch";
50
+
hash = "sha256-0asXI08XITkFc73EUenV9qxY/Eak+TzygRRK7GvhQUc=";
51
+
revert = true;
52
+
})
53
+
];
54
+
29
55
nativeBuildInputs = [
30
56
gobject-introspection
31
57
wrapGAppsHook3
···
57
83
];
58
84
59
85
preFixup = ''
60
-
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}")
86
+
gappsWrapperArgs+=(
87
+
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}"
88
+
# For settings migration.
89
+
--prefix PATH : "${lib.makeBinPath [ dconf ]}"
90
+
)
61
91
'';
62
92
63
93
passthru.tests.test = nixosTests.terminal-emulators.guake;
···
65
95
meta = with lib; {
66
96
description = "Drop-down terminal for GNOME";
67
97
homepage = "http://guake-project.org";
68
-
license = licenses.gpl2;
98
+
license = licenses.gpl2Plus;
69
99
maintainers = [ maintainers.msteen ];
70
100
platforms = platforms.linux;
71
101
};
+34
pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch
+34
pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch
···
1
+
diff --git a/guake/guake_app.py b/guake/guake_app.py
2
+
index 48074db..d7d1371 100644
3
+
--- a/guake/guake_app.py
4
+
+++ b/guake/guake_app.py
5
+
@@ -109,12 +109,7 @@ class Guake(SimpleGladeApp):
6
+
SCHEMA_DIR, Gio.SettingsSchemaSource.get_default(), False
7
+
)
8
+
9
+
- try:
10
+
- schema_source = load_schema()
11
+
- except GLib.Error: # pylint: disable=catching-non-exception
12
+
- log.exception("Unable to load the GLib schema, try to compile it")
13
+
- try_to_compile_glib_schemas()
14
+
- schema_source = load_schema()
15
+
+ schema_source = load_schema()
16
+
self.settings = Settings(schema_source)
17
+
self.accel_group = None
18
+
19
+
@@ -122,13 +117,8 @@ class Guake(SimpleGladeApp):
20
+
"schema-version" not in self.settings.general.keys()
21
+
or self.settings.general.get_string("schema-version") != guake_version()
22
+
):
23
+
- log.exception("Schema from old guake version detected, regenerating schema")
24
+
- try:
25
+
- try_to_compile_glib_schemas()
26
+
- except subprocess.CalledProcessError:
27
+
- log.exception("Schema in non user-editable location, attempting to continue")
28
+
- schema_source = load_schema()
29
+
- self.settings = Settings(schema_source)
30
+
+ log.exception("Schema from old guake version detected")
31
+
+ # Kept for compatibility with other distros.
32
+
self.settings.general.set_string("schema-version", guake_version())
33
+
34
+
log.info("Language previously loaded from: %s", LOCALE_DIR)