cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fbpanel: 6.1 -> 7.0

Browse source 
Fixes: #176966
This commit is contained in:
Michael Raskin 2024-02-02 12:17:33 +01:00
parent edb1e29f51
commit ccdd15cd04
1 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,30 +1,51 @@
{ lib, stdenv, fetchurl, pkg-config { lib
, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg, gdk-pixbuf, gdk-pixbuf-xlib , stdenv
, fetchFromGitHub
, pkg-config
, libX11
, libXmu
, libXpm
, gtk2
, libpng
, libjpeg
, libtiff
, librsvg
, gdk-pixbuf
, gdk-pixbuf-xlib
, pypy2
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fbpanel"; pname = "fbpanel";
version = "6.1"; version = "7.0";
src = fetchurl { src = fetchFromGitHub {
url = "mirror://sourceforge/fbpanel/${pname}-${version}.tbz2"; owner = "aanatoly";
sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; repo = "fbpanel";
rev = "478754b687e2b48b111507ea22e8e2a001be5199";
hash = "sha256-+KcVcrh1aV6kjLGyiDnRHXSzJfelXWrhJS0DitG4yPA=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config pypy2 ];
buildInputs = buildInputs = [
[ libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg gdk-pixbuf gdk-pixbuf-xlib.dev ]; libX11
libXmu
libXpm
gtk2
libpng
libjpeg
libtiff
librsvg
gdk-pixbuf
gdk-pixbuf-xlib.dev
];
preConfigure = "patchShebangs ."; preConfigure = ''
sed -re '1i#!${pypy2}/bin/pypy' -i configure .config/*.py
postConfigure = '' sed -re 's/\<out\>/outputredirect/g' -i .config/rules.mk
substituteInPlace config.mk \ sed -i 's/struct\ \_plugin_instance \*stam\;//' panel/plugin.h
--replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
''; '';
# Workaround build failure on -fno-common toolchains like upstream makeFlags = ["V=1"];
# gcc-10. Otherwise build fails as: NIX_CFLAGS_COMPILE = ["-Wno-error" "-I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"];
# ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here
env.NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS="-lX11";
meta = with lib; { meta = with lib; {
description = "A stand-alone panel"; description = "A stand-alone panel";
@ -34,9 +55,4 @@ stdenv.mkDerivation rec {
mainProgram = "fbpanel"; mainProgram = "fbpanel";
}; };
passthru = {
updateInfo = {
downloadPage = "fbpanel.sourceforge.net";
};
};
} }