shutter: wrap XDG_DATA_DIRS with hicolor-icon-theme
#39913
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Success on x86_64-linux (full log) Attempted: shutter Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: shutter Partial log (click to expand)
|
xeji
reviewed
May 4, 2018
| @@ -29,6 +31,7 @@ stdenv.mkDerivation rec { | |||
| wrapProgram $out/bin/shutter \ | |||
| --set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \ | |||
| --prefix PATH : "${imagemagick.out}/bin" \ | |||
| --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \ | |||
There was a problem hiding this comment.
Putting hicolor-icon-theme first means it will have precedence over any user-installed themes in XDG_DATA_DIRS.
If it is meant as a fallback for missing icons, --suffix might be better here.
There was a problem hiding this comment.
you're absolutely right, missed that, thanks!
When opening `shutter` it adds an indicator icon to the status bar. However this doesn't happen (and an ugly default icon will be used) if `shutter` can't find the `hicolor-icon-theme`. In such a case a warning like this can be found in `stderr`: ``` Gtk-WARNING **: Could not find the icon 'image-png'. The 'hicolor' theme was not found either, perhaps you need to install it. ``` As I don't think that we should force users to install this theme globally and several other packages including `tor-browser`, `gparted` or `clawsmail` add `hicolor-icon-theme` to their closure this seems to be a fair measure.
Ma27
force-pushed
the
shutter/add-hicolor-icon-theme
branch
from
0ad1d46
to
40226e6
Compare
|
Success on x86_64-linux (full log) Attempted: shutter Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: shutter Partial log (click to expand)
|
|
Backported to 18.03: 92e6593 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
When opening
shutterit adds an indicator icon to the status bar.However this doesn't happen (and an ugly default icon will be used) if
shuttercan't find thehicolor-icon-theme. In such a case a warninglike this can be found in
stderr:As I don't think that we should force users to install this theme
globally and several other packages including
tor-browser,gpartedor
clawsmailaddhicolor-icon-themeto their closure this seems tobe a fair measure.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)