Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gnome/eog: add jxl support #269563

Merged
merged 2 commits into from
Apr 19, 2024
Merged

gnome/eog: add jxl support #269563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e657b9
gnome: add `jxl` thumbnails and wallpapers support
zzzsyyy Nov 24, 2023
2f6d5ff
eog: add `jxl` support
zzzsyyy Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkgs/desktops/gnome/core/eog/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
, exempi
, shared-mime-info
, wrapGAppsHook
, libjxl
, librsvg
, webp-pixbuf-loader
, libheif
Expand Down Expand Up @@ -81,10 +82,11 @@ stdenv.mkDerivation rec {
];

postInstall = ''
# Pull in WebP support for gnome-backgrounds.
# Pull in WebP and JXL support for gnome-backgrounds.
# In postInstall to run before gappsWrapperArgsHook.
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
libjxl
librsvg
webp-pixbuf-loader
libheif.out
Expand All @@ -96,6 +98,7 @@ stdenv.mkDerivation rec {
gappsWrapperArgs+=(
# Thumbnailers
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
--prefix XDG_DATA_DIRS : "${libjxl}/share"
--prefix XDG_DATA_DIRS : "${librsvg}/share"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
)
Expand Down
4 changes: 3 additions & 1 deletion pkgs/desktops/gnome/core/gnome-control-center/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
, libgudev
, libadwaita
, libkrb5
, libjxl
, libpulseaudio
, libpwquality
, librsvg
Expand Down Expand Up @@ -173,10 +174,11 @@ stdenv.mkDerivation (finalAttrs: {
'';

postInstall = ''
# Pull in WebP support for gnome-backgrounds.
# Pull in WebP and JXL support for gnome-backgrounds.
# In postInstall to run before gappsWrapperArgsHook.
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
libjxl
librsvg
webp-pixbuf-loader
];
Expand Down
4 changes: 3 additions & 1 deletion pkgs/desktops/gnome/core/gnome-shell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
, unzip
, shared-mime-info
, libgweather
, libjxl
, librsvg
, webp-pixbuf-loader
, geoclue2
Expand Down Expand Up @@ -188,10 +189,11 @@ stdenv.mkDerivation (finalAttrs: {
'';

postInstall = ''
# Pull in WebP support for gnome-backgrounds.
# Pull in WebP and JXL support for gnome-backgrounds.
# In postInstall to run before gappsWrapperArgsHook.
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
libjxl
librsvg
webp-pixbuf-loader
];
Expand Down
2 changes: 2 additions & 0 deletions pkgs/desktops/gnome/core/nautilus/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
, shared-mime-info
, libnotify
, libexif
, libjxl
, libseccomp
, librsvg
, webp-pixbuf-loader
Expand Down Expand Up @@ -106,6 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
gappsWrapperArgs+=(
# Thumbnailers
--prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
--prefix XDG_DATA_DIRS : "${libjxl}/share"
--prefix XDG_DATA_DIRS : "${librsvg}/share"
--prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"
--prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
Expand Down
4 changes: 3 additions & 1 deletion pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
, xdg-desktop-portal
, wayland
, gnome
, libjxl
, librsvg
, webp-pixbuf-loader
}:
Expand Down Expand Up @@ -50,10 +51,11 @@ stdenv.mkDerivation rec {
];

postInstall = ''
# Pull in WebP support for gnome-backgrounds.
# Pull in WebP and JXL support for gnome-backgrounds.
# In postInstall to run before gappsWrapperArgsHook.
export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
extraLoaders = [
libjxl
librsvg
webp-pixbuf-loader
];
Expand Down
Loading