alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #97608 from ryneeverett/lxpanel-20.03-zhf

Browse source 
lxpanel: fix build by switching to gdk-pixbuf-xlib
This commit is contained in:
WORLDofPEACE 2020-09-09 20:59:57 -04:00 committed by GitHub
parent c413f10daf 5b49a74747
commit 2e7fcfd5b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/desktops/lxde/core/lxpanel/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder { 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 , menu-cache, lxmenu-data, wirelesstools
, supportAlsa ? false, alsaLib , supportAlsa ? false, alsaLib
}: }:
@ -14,10 +14,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ]; nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ];
buildInputs = [ 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 menu-cache lxmenu-data m4 wirelesstools
] ++ stdenv.lib.optional supportAlsa alsaLib; ] ++ 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 = { meta = {
description = "Lightweight X11 desktop panel for LXDE"; description = "Lightweight X11 desktop panel for LXDE";
homepage = "https://lxde.org/"; homepage = "https://lxde.org/";