diff options
| author | ryneeverett <ryneeverett@gmail.com> | 2020-09-09 22:25:54 +0000 |
|---|---|---|
| committer | ryneeverett <ryneeverett@gmail.com> | 2020-09-09 23:30:34 +0000 |
| commit | 5b49a74747b41940e663385e21fe8ab5155d9a29 (patch) | |
| tree | b40fcc245f12c4663c939d6a64e56fd23f586bf0 /pkgs/desktops | |
| parent | 7bc3a08d3a4c700b53a3b27f5acd149f24b931ec (diff) | |
| download | nixpkgs-5b49a74747b41940e663385e21fe8ab5155d9a29.tar nixpkgs-5b49a74747b41940e663385e21fe8ab5155d9a29.tar.gz nixpkgs-5b49a74747b41940e663385e21fe8ab5155d9a29.tar.bz2 nixpkgs-5b49a74747b41940e663385e21fe8ab5155d9a29.tar.lz nixpkgs-5b49a74747b41940e663385e21fe8ab5155d9a29.tar.xz nixpkgs-5b49a74747b41940e663385e21fe8ab5155d9a29.tar.zst nixpkgs-5b49a74747b41940e663385e21fe8ab5155d9a29.zip | |
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.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/lxde/core/lxpanel/default.nix | 11 |
1 files 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/"; |