diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-17 00:04:10 -0400 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2019-08-17 18:55:23 -0400 |
| commit | 8d06479312a4f0c5822bde80474be62b43081134 (patch) | |
| tree | 20e6d02376654115ebf4597c6f39297115e43db1 | |
| parent | 1c9ee3500fe97b3883fb0625dfb4b9385e170b04 (diff) | |
| download | nixpkgs-8d06479312a4f0c5822bde80474be62b43081134.tar nixpkgs-8d06479312a4f0c5822bde80474be62b43081134.tar.gz nixpkgs-8d06479312a4f0c5822bde80474be62b43081134.tar.bz2 nixpkgs-8d06479312a4f0c5822bde80474be62b43081134.tar.lz nixpkgs-8d06479312a4f0c5822bde80474be62b43081134.tar.xz nixpkgs-8d06479312a4f0c5822bde80474be62b43081134.tar.zst nixpkgs-8d06479312a4f0c5822bde80474be62b43081134.zip | |
xfce4-14.xfce4-panel: drop custom wrapper
| -rw-r--r-- | pkgs/desktops/xfce4-14/xfce4-panel/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix index 03daaca1103..786cff94c93 100644 --- a/pkgs/desktops/xfce4-14/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-14/xfce4-panel/default.nix @@ -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 { category = "xfce"; @@ -7,8 +7,7 @@ mkXfceDerivation rec { sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; + buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; patches = [ ../../xfce/core/xfce4-panel-datadir.patch ]; patchFlags = "-p1"; @@ -24,12 +23,6 @@ mkXfceDerivation rec { 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 = { description = "Xfce's panel"; }; |