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

Merge pull request #99591 from santicalcagno/fix-fbpanel-build

Browse source 
fbpanel: fix build by adding gdk-pixbuf-xlib
This commit is contained in:
Michael Raskin 2020-10-05 05:10:15 +00:00 committed by GitHub
parent 68028488d8 104017def0
commit c35af7b345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/window-managers/fbpanel/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg , libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,10 +10,15 @@ stdenv.mkDerivation rec {
sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965";
}; };
buildInputs = buildInputs =
[ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg ]; [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ];
preConfigure = "patchShebangs ."; preConfigure = "patchShebangs .";
postConfigure = ''
substituteInPlace config.mk \
--replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
'';
NIX_LDFLAGS="-lX11"; NIX_LDFLAGS="-lX11";
meta = with stdenv.lib; { meta = with stdenv.lib; {