summary refs log tree commit diff
path: root/pkgs/desktops/xfce
diff options
context:
space:
mode:
authorYell0w Ghost <34014106+yellowgh0st@users.noreply.github.com>2017-11-30 14:15:02 +0100
committerYegor Timoshenko <yegortimoshenko@gmail.com>2017-12-18 18:17:51 +0000
commitd9f4f9e3f90581a8b5f2bcbb8799ee723203c23d (patch)
treeaf51f9904201dcaa89fd25c8013f5c243c32d03e /pkgs/desktops/xfce
parentc6c05dd2553f51d3ddd1070ab9ac118022316864 (diff)
downloadnixlib-d9f4f9e3f90581a8b5f2bcbb8799ee723203c23d.tar
nixlib-d9f4f9e3f90581a8b5f2bcbb8799ee723203c23d.tar.gz
nixlib-d9f4f9e3f90581a8b5f2bcbb8799ee723203c23d.tar.bz2
nixlib-d9f4f9e3f90581a8b5f2bcbb8799ee723203c23d.tar.lz
nixlib-d9f4f9e3f90581a8b5f2bcbb8799ee723203c23d.tar.xz
nixlib-d9f4f9e3f90581a8b5f2bcbb8799ee723203c23d.tar.zst
nixlib-d9f4f9e3f90581a8b5f2bcbb8799ee723203c23d.zip
xfdesktop: fix #12832 GTK 2.24.31 regression
Contains bug fix for #12832 which solves issue with GTK 2.24.31
regression - grayed out folders in wallpaper chooser dialog.
Diffstat (limited to 'pkgs/desktops/xfce')
-rw-r--r--pkgs/desktops/xfce/core/xfdesktop.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix
index 8802862eddde..165381451425 100644
--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
 , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify
 , hicolor_icon_theme }:
 let
@@ -14,10 +14,15 @@ stdenv.mkDerivation rec {
     sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
   };
 
-  buildInputs =
-    [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
-      libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme
-    ];
+  buildInputs = [
+    pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
+    libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme
+  ];
+
+  patches = [(fetchpatch {
+    url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27;
+    sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x";
+  })];
 
   enableParallelBuilding = true;
 
@@ -29,4 +34,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.eelco ];
   };
 }
-