public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xfce4-14.xfce4-panel: drop custom wrapper

Browse Source
This commit is contained in:
worldofpeace 2019-08-17 00:04:10 -04:00
parent 1c9ee3500f
commit 8d06479312
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/desktops/xfce4-14/xfce4-panel/default.nix
View File

@ -1,4 +1,4 @@
{ mkXfceDerivation, makeWrapper, tzdata, exo, garcon, gtk2, gtk3, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf }: { mkXfceDerivation, tzdata, exo, garcon, gtk2, gtk3, glib, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf }:
mkXfceDerivation rec { mkXfceDerivation rec {
category = "xfce"; category = "xfce";
@ -7,8 +7,7 @@ mkXfceDerivation rec {
sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15"; sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15";
nativeBuildInputs = [ makeWrapper ]; buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ];
buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
patches = [ ../../xfce/core/xfce4-panel-datadir.patch ]; patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
patchFlags = "-p1"; patchFlags = "-p1";
@ -24,12 +23,6 @@ mkXfceDerivation rec {
configureFlags = [ "--enable-gtk3" ]; configureFlags = [ "--enable-gtk3" ];
postInstall = ''
wrapProgram "$out/bin/xfce4-panel" \
--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
--prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules"
'';
meta = { meta = {
description = "Xfce's panel"; description = "Xfce's panel";
}; };