From 04bb21e5a27aa2891f6b0a807134c49cc4bb905e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 26 Sep 2022 23:48:36 +0200 Subject: [PATCH 1/5] imlib2: enable webp support by default --- pkgs/development/libraries/imlib2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 12d972390630..4d8088c80e6c 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -6,9 +6,9 @@ , libid3tag, librsvg, libheif , freetype , bzip2, pkg-config , x11Support ? true, xlibsWrapper ? null +, webpSupport ? true , svgSupport ? false , heifSupport ? false -, webpSupport ? false , jxlSupport ? false , psSupport ? false From c84404e4b61b7d77f5ed30fbc3259d4c2a07a836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 26 Sep 2022 23:49:35 +0200 Subject: [PATCH 2/5] feh: use imlib2Full --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e508cc2b57c5..3107f42b270a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28059,7 +28059,9 @@ with pkgs; fdupes = callPackage ../tools/misc/fdupes { }; - feh = callPackage ../applications/graphics/feh { }; + feh = callPackage ../applications/graphics/feh { + imlib2 = imlib2Full; + }; feishu = callPackage ../applications/networking/instant-messengers/feishu {}; From bd6b07a2c1cce70ea6c114df289744329ff762f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 26 Sep 2022 23:56:50 +0200 Subject: [PATCH 3/5] sxiv,nsxiv: use imlib2Full --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3107f42b270a..dca918ae11c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31297,9 +31297,13 @@ with pkgs; swingsane = callPackage ../applications/graphics/swingsane { }; - sxiv = callPackage ../applications/graphics/sxiv { }; + sxiv = callPackage ../applications/graphics/sxiv { + imlib2 = imlib2Full; + }; - nsxiv = callPackage ../applications/graphics/nsxiv { }; + nsxiv = callPackage ../applications/graphics/nsxiv { + imlib2 = imlib2Full; + }; resilio-sync = callPackage ../applications/networking/resilio-sync { }; From 178aaddb934b983068e1cf129d2b2c87f10b3e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 26 Sep 2022 23:56:36 +0200 Subject: [PATCH 4/5] qiv: use imlib2Full --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca918ae11c1..a732913fcbca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30754,7 +30754,9 @@ with pkgs; pqiv = callPackage ../applications/graphics/pqiv { }; - qiv = callPackage ../applications/graphics/qiv { }; + qiv = callPackage ../applications/graphics/qiv { + imlib2 = imlib2Full; + }; premid = callPackage ../applications/misc/premid { }; From 55c37b6ac2295d29156dec4b73152c6a90249f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 26 Sep 2022 23:56:22 +0200 Subject: [PATCH 5/5] jfbview: use imlib2Full --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a732913fcbca..1e94a5ce032d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24530,7 +24530,9 @@ with pkgs; iwd = callPackage ../os-specific/linux/iwd { }; - jfbview = callPackage ../os-specific/linux/jfbview { }; + jfbview = callPackage ../os-specific/linux/jfbview { + imlib2 = imlib2Full; + }; jfbpdf = jfbview.override { imageSupport = false; };