From 5b49a74747b41940e663385e21fe8ab5155d9a29 Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Wed, 9 Sep 2020 22:25:54 +0000 Subject: [PATCH] lxpanel: fix build by switching to gdk-pixbuf-xlib The build has been broken since gdk-pixbuf-xlib was broken out into a separate package in #88086. For some reason if I just add gdk-pixbuf-xlib.dev the headers don't make it into CFLAGS. --- pkgs/desktops/lxde/core/lxpanel/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index 20b5a35fc30..da146764c32 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder -, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf +, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf, gdk-pixbuf-xlib , menu-cache, lxmenu-data, wirelesstools , supportAlsa ? false, alsaLib }: @@ -14,10 +14,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ]; buildInputs = [ - keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf + keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf gdk-pixbuf-xlib.dev menu-cache lxmenu-data m4 wirelesstools ] ++ stdenv.lib.optional supportAlsa alsaLib; + postPatch = '' + substituteInPlace src/Makefile.in \ + --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" + substituteInPlace plugins/Makefile.in \ + --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" + ''; + meta = { description = "Lightweight X11 desktop panel for LXDE"; homepage = "https://lxde.org/";