From 80a89002f1ad1d89f8fe926b6ac6aefae169d5b4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 18 May 2020 21:03:59 +0200 Subject: [PATCH] gdk-pixbuf: do not build deprecated xlib library It is deprecated and will be removed: https://mail.gnome.org/archives/desktop-devel-list/2019-November/msg00009.html Until then, you can use gdk-pixbuf-xlib package. --- pkgs/development/libraries/gdk-pixbuf/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 64a1adef0c4a..08b8f70b2d9a 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -16,7 +16,6 @@ , libtiff , libjpeg , libpng -, libX11 , gnome3 , gobject-introspection , doCheck ? false @@ -65,11 +64,6 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; - # !!! We might want to factor out the gdk-pixbuf-xlib subpackage. - buildInputs = [ - libX11 - ]; - propagatedBuildInputs = [ glib libtiff @@ -79,7 +73,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddocs=true" - "-Dx11=true" + "-Dx11=false" # use gdk-pixbuf-xlib "-Dgir=${if gobject-introspection != null then "true" else "false"}" "-Dgio_sniffing=false" ];