Skip to content

Commit

Permalink
lxpanel: fix build by switching to gdk-pixbuf-xlib
Browse files Browse the repository at this point in the history
The build has been broken since gdk-pixbuf-xlib was broken out into a
separate package in NixOS#88086.

For some reason if I just add gdk-pixbuf-xlib.dev the headers don't make it
into CFLAGS.
  • Loading branch information
ryneeverett committed Sep 9, 2020
1 parent 7bc3a08 commit 5b49a74
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions 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
}:
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

0 comments on commit 5b49a74

Please sign in to comment.