diff options
Diffstat (limited to 'nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix')
-rw-r--r-- | nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix index b7bede9e27bb..0a08d3882386 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -1,17 +1,48 @@ -{ mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf, gobject-introspection }: +{ mkXfceDerivation +, exo +, garcon +, gettext +, glib +, gobject-introspection +, gtk3 +, libdbusmenu-gtk3 +, libwnck3 +, libxfce4ui +, libxfce4util +, tzdata +, vala +, xfconf +}: mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.4"; + version = "4.16.2"; - sha256 = "1srzgb9vsvfrbhym74zkz9hdhxcrvbffxpfgv5vprhlwxw3vk3fq"; + sha256 = "0wy66viwjnp1c0lgf90fp3vyqy0f1m1kbfdym8a0yrv2b6sn3958"; - nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; + nativeBuildInputs = [ + gobject-introspection + vala + ]; + + buildInputs = [ + exo + garcon + libdbusmenu-gtk3 + libxfce4ui + libwnck3 + xfconf + tzdata + ]; + + propagatedBuildInputs = [ + glib + gtk3 + libxfce4util + ]; patches = [ ./xfce4-panel-datadir.patch ]; - patchFlags = [ "-p1" ]; postPatch = '' for f in $(find . -name \*.sh); do @@ -21,9 +52,10 @@ mkXfceDerivation { --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo" ''; - configureFlags = [ "--enable-gtk3" ]; + # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - meta = { + meta = { description = "Xfce's panel"; }; } |