Merge pull request #97608 from ryneeverett/lxpanel-20.03-zhf
lxpanel: fix build by switching to gdk-pixbuf-xlib
This commit is contained in:
commit
2e7fcfd5b2
1 changed files with 9 additions and 2 deletions
|
@ -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/";
|
||||
|
|
Loading…
Reference in a new issue