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.

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

librsvg: fix thumbnailer path #29984

Merged
merged 1 commit into from Oct 1, 2017
Merged

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Oct 1, 2017

Motivation for this change

librsvg hooks itself into gdk-pixbuf and then uses gdk-pixbuf-thumbnailer as the thumbnailer, extending its supported MIME type list.

Unfortunately, librsvg assumes the thumbnailer will be located in the same bindir as librsvg binaries would, which is not true on Nix-powered systems.

This commit corrects the bindir path of the thumbnailer to the gdk_pixbuf derivation.

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
    • Linux
  • 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.

cc @vcunat

librsvg hooks itself into gdk-pixbuf and then uses gdk-pixbuf-thumbnailer
as the thumbnailer, extending its supported MIME type list.

Unfortunately, librsvg assumes the thumbnailer will be located in the same
bindir as librsvg binaries would, which is not true on Nix-powered systems.

This commit corrects the bindir path of the thumbnailer to the gdk_pixbuf
derivation.
@jtojnar jtojnar mentioned this pull request Oct 1, 2017
8 tasks
@jtojnar jtojnar changed the base branch from master to staging October 1, 2017 13:21
@jtojnar
Copy link
Contributor Author

jtojnar commented Oct 1, 2017

Confirmed working with Nautilus.

@vcunat
Copy link
Member

vcunat commented Oct 1, 2017

Not a mass rebuild, most likely

Estimating rebuild amount by counting changed Hydra jobs.                                                                                        
     63 x86_64-darwin                                                                                                                            
    587 x86_64-linux

@vcunat vcunat changed the base branch from staging to master October 1, 2017 14:54
@vcunat vcunat merged commit dd200f8 into NixOS:master Oct 1, 2017
vcunat added a commit that referenced this pull request Oct 1, 2017
@jtojnar jtojnar deleted the librsvg-thumbnailer branch October 1, 2017 14:59
@jtojnar
Copy link
Contributor Author

jtojnar commented Oct 1, 2017

It is a dependency of wrapGAppsHook so I thought it would be mass enough. Did not know about maintainers/scripts/rebuild-amount.sh. What number is considered a mass rebuild?

@vcunat
Copy link
Member

vcunat commented Oct 1, 2017

There's no fixed number; I'm just trying to choose reasonably to avoid overloading Hydra while not delaying small rebuilds unnecessarily. The "trunk jobset" currently shows ~40k jobs, composed of three platforms, and this will make under a thousand, most likely.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants