diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2024-04-26 23:22:30 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2024-04-27 00:05:46 +0200 |
commit | 37383113cc1df4b1441e0d8b38bac5357f94f6be (patch) | |
tree | eb5a5be214d76a4b7322da2b42a53476ec881520 | |
parent | 70cf3ecaae5ca437d5b6494ab204f15e2557a8cd (diff) |
wrapGAppsHook3: rename from wrapGAppsHook
GTK 3 is slowly approaching deprecation so let’s not make it default.
-rw-r--r-- | doc/languages-frameworks/gnome.section.md | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 386c5a0ae657a..a7e2f87b37b76 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -104,8 +104,8 @@ Given the requirements above, the package expression would become messy quickly: Fortunately, we have a [family of hooks]{#ssec-gnome-hooks-wrapgappshook} that automate this. They work in conjunction with other setup hooks that populate environment variables, and will then wrap all executables in `bin` and `libexec` directories using said variables. -- `wrapGAppsHook` for GTK 3 apps. For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. -- [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4} for GTK 4 apps. Same as [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook} but replaces `gtk3` with `gtk4`. +- [`wrapGAppsHook3`]{#ssec-gnome-hooks-wrapgappshook3} for GTK 3 apps. For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. +- [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4} for GTK 4 apps. Same as [`wrapGAppsHook3`]{#ssec-gnome-hooks-wrapgappshook3} but replaces `gtk3` with `gtk4`. - [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook} for programs without a graphical interface. Same as the above but does not bring `gtk3` and `librsvg` into the closure. The hooks do the the following: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 955f1e54b6735..0dc29abc0b7d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1434,10 +1434,12 @@ with pkgs; name = "find-xml-catalogs-hook"; } ../build-support/setup-hooks/find-xml-catalogs.sh; - wrapGAppsHook = wrapGAppsNoGuiHook.override { + wrapGAppsHook3 = wrapGAppsNoGuiHook.override { isGraphical = true; }; + wrapGAppsHook = wrapGAppsHook3; + wrapGAppsHook4 = wrapGAppsNoGuiHook.override { isGraphical = true; gtk3 = __splicedPackages.gtk4; |