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

wrapGAppsHook3: rename from wrapGAppsHook

Browse source 
GTK 3 is slowly approaching deprecation so let’s not make it default.
This commit is contained in:
Jan Tojnar 2024-04-26 23:22:30 +02:00
parent 70cf3ecaae
commit 37383113cc
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/languages-frameworks/gnome.section.md
View file

@ -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. 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. - [`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 [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook} but replaces `gtk3` with `gtk4`. - [`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. - [`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: The hooks do the the following:

4
pkgs/top-level/all-packages.nix
View file

@ -1434,10 +1434,12 @@ with pkgs;
name = "find-xml-catalogs-hook"; name = "find-xml-catalogs-hook";
} ../build-support/setup-hooks/find-xml-catalogs.sh; } ../build-support/setup-hooks/find-xml-catalogs.sh;
wrapGAppsHook = wrapGAppsNoGuiHook.override { wrapGAppsHook3 = wrapGAppsNoGuiHook.override {
isGraphical = true; isGraphical = true;
}; };
wrapGAppsHook = wrapGAppsHook3;
wrapGAppsHook4 = wrapGAppsNoGuiHook.override { wrapGAppsHook4 = wrapGAppsNoGuiHook.override {
isGraphical = true; isGraphical = true;
gtk3 = __splicedPackages.gtk4; gtk3 = __splicedPackages.gtk4;