nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 11:53:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #202962 from dotlambda/lxpanel-gtk3

Browse Source 
lxpanel: use gtk3 by default
This commit is contained in:
Anderson Torres 2022-11-26 18:24:52 -03:00 committed by GitHub
commit 8a32dd168c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/desktops/lxde/core/lxpanel/default.nix
View File

@ -7,10 +7,13 @@
, intltool , intltool
, libxmlxx , libxmlxx
, keybinder , keybinder
, keybinder3
, gtk2 , gtk2
, gtk3
, libX11 , libX11
, libfm , libfm
, libwnck2 , libwnck2
, libwnck3
, libXmu , libXmu
, libXpm , libXpm
, cairo , cairo
@ -21,6 +24,7 @@
, wirelesstools , wirelesstools
, curl , curl
, supportAlsa ? false, alsa-lib , supportAlsa ? false, alsa-lib
, withGtk3 ? true
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -34,11 +38,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ]; nativeBuildInputs = [ pkg-config gettext m4 intltool libxmlxx ];
buildInputs = [ buildInputs = [
keybinder (if withGtk3 then keybinder3 else keybinder)
gtk2 (if withGtk3 then gtk3 else gtk2)
libX11 libX11
libfm (libfm.override { inherit withGtk3; })
libwnck2 (if withGtk3 then libwnck3 else libwnck2)
libXmu libXmu
libXpm libXpm
cairo cairo
@ -58,6 +62,8 @@ stdenv.mkDerivation rec {
--replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0" --replace "@PACKAGE_CFLAGS@" "@PACKAGE_CFLAGS@ -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
''; '';
configureFlags = lib.optional withGtk3 "--enable-gtk3";
meta = with lib; { meta = with lib; {
description = "Lightweight X11 desktop panel for LXDE"; description = "Lightweight X11 desktop panel for LXDE";
homepage = "https://lxde.org/"; homepage = "https://lxde.org/";