diff options
| author | Robert Scott <code@humanleg.org.uk> | 2022-09-28 20:01:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 20:01:12 +0100 |
| commit | b4fb830c375539ac3cb693544996d6f8d40b705a (patch) | |
| tree | 4ecbed40dd44d60292d431a703520c629e1c7218 | |
| parent | f18d801779602b884f219f9370bdbba692f3fd4c (diff) | |
| parent | 55c37b6ac2295d29156dec4b73152c6a90249f62 (diff) | |
| download | nixpkgs-b4fb830c375539ac3cb693544996d6f8d40b705a.tar nixpkgs-b4fb830c375539ac3cb693544996d6f8d40b705a.tar.gz nixpkgs-b4fb830c375539ac3cb693544996d6f8d40b705a.tar.bz2 nixpkgs-b4fb830c375539ac3cb693544996d6f8d40b705a.tar.lz nixpkgs-b4fb830c375539ac3cb693544996d6f8d40b705a.tar.xz nixpkgs-b4fb830c375539ac3cb693544996d6f8d40b705a.tar.zst nixpkgs-b4fb830c375539ac3cb693544996d6f8d40b705a.zip | |
Merge pull request #193096 from ncfavier/imlib2-defaults
imlib2: support webp by default, use full package in image viewers
| -rw-r--r-- | pkgs/development/libraries/imlib2/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 12d97239063..4d8088c80e6 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88757c2aa13..cbdf8d031a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24513,7 +24513,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; }; @@ -28040,7 +28042,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 {}; @@ -30721,7 +30725,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 { }; @@ -31264,9 +31270,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 { }; |