lxpanel: fix build with gcc14, modernize (#395103)
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch2,
|
||||
pkg-config,
|
||||
gettext,
|
||||
m4,
|
||||
@@ -29,15 +30,24 @@
|
||||
withGtk3 ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "lxpanel";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
|
||||
url = "mirror://sourceforge/lxde/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-HjGPV9fja2HCOlBNA9JDDHja0ULBgERRBh8bPqVEHug=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# fix build with gcc14
|
||||
# https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/lxde/lxpanel/commit/0853b0fc981285ebd2ac52f8dfc2a09b1090748c.patch?full_index=1";
|
||||
hash = "sha256-lj4CWdiUQhEc9J8UNKcP7/tmsGnPjA5pwXAok5YFW4M=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gettext
|
||||
@@ -72,11 +82,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
configureFlags = lib.optional withGtk3 "--enable-gtk3";
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Lightweight X11 desktop panel for LXDE";
|
||||
homepage = "https://lxde.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.ryneeverett ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ lib.maintainers.ryneeverett ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user