Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

lxpanel: fix build by switching to gdk-pixbuf-xlib #97608

Merged
merged 1 commit into from Sep 10, 2020
Merged

lxpanel: fix build by switching to gdk-pixbuf-xlib #97608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions pkgs/desktops/lxde/core/lxpanel/default.nix
View file
Open in desktop
@@ -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
}:
Expand All @@ -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/";
Expand Down