diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-10-08 10:20:07 +0200 |
| commit | 6565abc264549742c9cddcb547506a2c245d6b2b (patch) | |
| tree | 5e770f59e8665e8de346bcf41c41a353cd4e0f44 /pkgs/development/libraries/imlib2 | |
| parent | bc2ce9630aa6d0dc28105becb260988136cd9ef6 (diff) | |
| parent | b078ae79375573c7af1f7952db3eae5e337e6572 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/libraries/imlib2')
| -rw-r--r-- | pkgs/development/libraries/imlib2/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 4d8088c80e6ca..66092f4365098 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -5,7 +5,7 @@ # imlib2 can load images from ID3 tags. , libid3tag, librsvg, libheif , freetype , bzip2, pkg-config -, x11Support ? true, xlibsWrapper ? null +, x11Support ? true , webpSupport ? true , svgSupport ? false , heifSupport ? false @@ -20,10 +20,11 @@ , openbox , fluxbox , enlightenment +, xorg }: let - inherit (lib) optional; + inherit (lib) optional optionals; in stdenv.mkDerivation rec { pname = "imlib2"; @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg libtiff giflib libpng bzip2 freetype libid3tag - ] ++ optional x11Support xlibsWrapper + ] ++ optionals x11Support [ xorg.libXft xorg.libXext ] ++ optional heifSupport libheif ++ optional svgSupport librsvg ++ optional webpSupport libwebp |