Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

xfce.xfdesktop: appending bug fix #32204

Closed
wants to merge 4 commits into from
Closed

xfce.xfdesktop: appending bug fix #32204

wants to merge 4 commits into from

Conversation

yellowgh0st
Copy link
Contributor

@yellowgh0st yellowgh0st commented Nov 30, 2017 •
edited

Contains Bug#12832 fix which solves issue with gtk 2.24.31 regression - grayed out folders in wallpaper choose dialog

https://bugzilla.xfce.org/show_bug.cgi?id=12832

Patch source:
https://git.xfce.org/xfce/xfdesktop/commit?id=157f5b55cfc3629d595ef38984278de5915aac27

Motivation for this change

Unable to change wallpapers folder in wallpaper choose dialog.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@yellowgh0st
xfce.xfdesktop: appending bug fix
44c4f99 
Contains Bug NixOS#12832 fix which solves issue with gtk 2.24.31 regression - grayed out folders in wallpaper choose dialog
jtojnar
jtojnar reviewed Nov 30, 2017
View reviewed changes
pkgs/desktops/xfce/core/xfdesktop.nix Outdated
patches =
[
(fetchurl {
url = https://git.xfce.org/users/eric/xfdesktop/patch/?id=cc311b61b82b7510a3a6cb0952d3a331e3551e05;
Copy link
Contributor

Choose a reason for hiding this comment

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

You can use directly https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27

Mic92
Mic92 reviewed Dec 1, 2017
View reviewed changes
pkgs/desktops/xfce/core/xfdesktop.nix Outdated
@@ -19,6 +19,13 @@ stdenv.mkDerivation rec {
libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme
];

patches =
[
(fetchurl {
Copy link
Member

Choose a reason for hiding this comment

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

please use fetchpatch instead of fetchurl.

@joachifm
Copy link
Contributor

@yellowgh0st have you considered @Mic92's review?

@yellowgh0st
Copy link
Contributor Author

@joachifm Thanks. Done.

@lukateras
Copy link
Member

This is somewhat worrisome:

output path ‘/nix/store/yrap184by45n26dsix6j1ijl65syihpb-patch?id=157f5b55cfc3629d595ef38984278de5915aac27’ has sha256 hash ‘0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x’ when ‘07yvhci0yccbxnqymh2cf49j8yc0jsw147mnjzw9iy4kghj2rqxj’ was expected
killing process 12775
cannot build derivation ‘/nix/store/ylgxzzx3jqvmw7aqg24k8c3p4jxipqm5-xfdesktop-4.12.3.drv’: 1 dependencies couldn't be built
error: build of ‘/nix/store/ylgxzzx3jqvmw7aqg24k8c3p4jxipqm5-xfdesktop-4.12.3.drv’ failed

Hopefully Xfce patch digests don't change.

@lukateras lukateras self-assigned this Dec 18, 2017
lukateras
lukateras approved these changes Dec 18, 2017
View reviewed changes
Copy link
Member

@lukateras lukateras left a comment •
edited

Choose a reason for hiding this comment

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

Patch solves the issue. I'm pushing it to master along with some cosmetic changes and a hash change. Thanks!

@lukateras
Copy link
Member

Merged in d9f4f9e.

@lukateras lukateras closed this Dec 18, 2017
@lukateras lukateras added the 6.topic: xfce The Xfce Desktop Environment label Dec 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@jtojnar jtojnar jtojnar left review comments

@lukateras lukateras lukateras approved these changes

Assignees

@lukateras lukateras

Labels
6.topic: xfce The Xfce Desktop Environment 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@yellowgh0st @joachifm @lukateras @Mic92 @jtojnar @GrahamcOfBorg