summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorvolth <volth@webmaster.ms>2018-07-17 23:05:54 +0000
committerxeji <36407913+xeji@users.noreply.github.com>2018-07-18 01:05:54 +0200
commit7adce5b870d60b9abe34439560671f79426eac3c (patch)
tree5903a0255c5efee1946e0e4bb0a3cb0490fa3fe3 /pkgs/desktops
parentc8f5d4708b73aadf6723f019e7c29e394b2f5461 (diff)
downloadnixpkgs-7adce5b870d60b9abe34439560671f79426eac3c.tar
nixpkgs-7adce5b870d60b9abe34439560671f79426eac3c.tar.gz
nixpkgs-7adce5b870d60b9abe34439560671f79426eac3c.tar.bz2
nixpkgs-7adce5b870d60b9abe34439560671f79426eac3c.tar.lz
nixpkgs-7adce5b870d60b9abe34439560671f79426eac3c.tar.xz
nixpkgs-7adce5b870d60b9abe34439560671f79426eac3c.tar.zst
nixpkgs-7adce5b870d60b9abe34439560671f79426eac3c.zip
xfce4-13.xfce4-panel: 4.13.2 -> 4.13.3 (#43628)
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/xfce4-13/xfce4-panel/default.nix24
1 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
index 88ba2de49be..7960ee84e38 100644
--- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
@@ -1,14 +1,32 @@
-{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+{ mkXfceDerivation, makeWrapper, exo, garcon, gtk2, gtk3, gettext, glib-networking, libxfce4ui, libxfce4util, libwnck3, xfconf }:
 
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.13.2";
+  version = "4.13.3";
 
-  sha256 = "194pihmg7af4x81nia2fy3h7rls306a7c0bqny9ycqikvi6nmdmn";
+  sha256 = "00b2b16wqwzdbh1vsnpl2kasa7f9i1hr1wkkjmvzmy2v7bmkygr0";
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
 
+  patches = [ ../../xfce/core/xfce4-panel-datadir.patch ];
+  patchFlags = "-p1";
+
+  postPatch = ''
+    for f in $(find . -name \*.sh); do
+      substituteInPlace $f --replace gettext ${gettext}/bin/gettext
+    done
+  '';
+
+  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";
   };