Skip to content

Commit

Permalink
xfdesktop: fix #12832 GTK 2.24.31 regression
Browse files Browse the repository at this point in the history
Contains bug fix for #12832 which solves issue with GTK 2.24.31
regression - grayed out folders in wallpaper chooser dialog.
  • Loading branch information
yellowgh0st authored and lukateras committed Dec 18, 2017
1 parent c6c05dd commit d9f4f9e
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions 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
Expand All @@ -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;

Expand All @@ -29,4 +34,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.eelco ];
};
}

1 comment on commit d9f4f9e

@lukateras
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't go completely as planned: should have linked to https://bugzilla.xfce.org/show_bug.cgi?id=12832 instead of leaving reference to #12832.

Please sign in to comment.