diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-25 10:10:13 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-05 22:42:13 +0200 |
| commit | 48a0757b7598a56d0dbd4bc0b0445cb52718b895 (patch) | |
| tree | 217a0e54bbb193887c961a69b11231e404dbeee1 | |
| parent | 0c0f16e2f7e72b48d490b52a467bcff712cc1dbe (diff) | |
| download | nixpkgs-48a0757b7598a56d0dbd4bc0b0445cb52718b895.tar nixpkgs-48a0757b7598a56d0dbd4bc0b0445cb52718b895.tar.gz nixpkgs-48a0757b7598a56d0dbd4bc0b0445cb52718b895.tar.bz2 nixpkgs-48a0757b7598a56d0dbd4bc0b0445cb52718b895.tar.lz nixpkgs-48a0757b7598a56d0dbd4bc0b0445cb52718b895.tar.xz nixpkgs-48a0757b7598a56d0dbd4bc0b0445cb52718b895.tar.zst nixpkgs-48a0757b7598a56d0dbd4bc0b0445cb52718b895.zip | |
wrapGAppsHook4: init
| -rw-r--r-- | doc/languages-frameworks/gnome.section.md | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 00bd524b0c5..734bf2b6389 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -68,7 +68,7 @@ preFixup = '' Fortunately, there is [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook}. It works in conjunction with other setup hooks that populate environment variables, and it will then wrap all executables in `bin` and `libexec` directories using said variables. -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. In case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure. +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. There is also [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4}, which replaces GTK 3 with GTK 4. And in case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure. - `wrapGAppsHook` itself will add the package’s `share` directory to `XDG_DATA_DIRS`. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d90d10a438c..bc0c07e102b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -637,6 +637,8 @@ in wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { }; + wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; }; + wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; }; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; |