Merge pull request #194491 from patricksjackson/imlib2

imlib2: use xorg.* packages directly instead of xlibsWrapper

authored by Sergei Trofimovich and committed by GitHub e185edf3 be3f8c0e

+4 -3
+4 -3
pkgs/development/libraries/imlib2/default.nix
··· 5 # imlib2 can load images from ID3 tags. 6 , libid3tag, librsvg, libheif 7 , freetype , bzip2, pkg-config 8 - , x11Support ? true, xlibsWrapper ? null 9 , svgSupport ? false 10 , heifSupport ? false 11 , webpSupport ? false ··· 20 , openbox 21 , fluxbox 22 , enlightenment 23 }: 24 25 let 26 - inherit (lib) optional; 27 in 28 stdenv.mkDerivation rec { 29 pname = "imlib2"; ··· 37 buildInputs = [ 38 libjpeg libtiff giflib libpng 39 bzip2 freetype libid3tag 40 - ] ++ optional x11Support xlibsWrapper 41 ++ optional heifSupport libheif 42 ++ optional svgSupport librsvg 43 ++ optional webpSupport libwebp
··· 5 # imlib2 can load images from ID3 tags. 6 , libid3tag, librsvg, libheif 7 , freetype , bzip2, pkg-config 8 + , x11Support ? true 9 , svgSupport ? false 10 , heifSupport ? false 11 , webpSupport ? false ··· 20 , openbox 21 , fluxbox 22 , enlightenment 23 + , xorg 24 }: 25 26 let 27 + inherit (lib) optional optionals; 28 in 29 stdenv.mkDerivation rec { 30 pname = "imlib2"; ··· 38 buildInputs = [ 39 libjpeg libtiff giflib libpng 40 bzip2 freetype libid3tag 41 + ] ++ optionals x11Support [ xorg.libXft xorg.libXext ] 42 ++ optional heifSupport libheif 43 ++ optional svgSupport librsvg 44 ++ optional webpSupport libwebp