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