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

gnome3.gnome-desktop: fix thumbnailing with missing fontconfig cache #56346

Merged
merged 1 commit into from Feb 25, 2019

Conversation

@hedning
Copy link
Contributor

hedning commented Feb 25, 2019

Motivation for this change

#56174 updated gnome-desktop which broke thumbnailing due to the sandbox trying to mount a non-existing directory (/var/cache/fontconfig). We patch the script so it won't try mounting the directory when it doesn't exist.

Things done

Tested thumbnailing in eog and gnome-desktop.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@jtojnar

This comment has been minimized.

Copy link
Contributor

jtojnar commented Feb 25, 2019

Can this be upstreamed?

@hedning

This comment has been minimized.

Copy link
Contributor Author

hedning commented Feb 25, 2019

I would think so.

@hedning

This comment has been minimized.

Copy link
Contributor Author

hedning commented Feb 25, 2019

upstream MR: https://gitlab.gnome.org/GNOME/gnome-desktop/merge_requests/34. Not sure if it's worth it to pull the patch from there?

Also use @storeDir@ instead of hardcoded /nix/store
@hedning hedning force-pushed the hedning:gnome-desktop-fix-thumbnailing branch from ce64ba5 to af9f9f5 Feb 25, 2019
@hedning

This comment has been minimized.

Copy link
Contributor Author

hedning commented Feb 25, 2019

MR landed upstream :) so changed things to fetchpatch so we'll easily catch it when upgrading.

@hedning hedning merged commit 9202c5a into NixOS:master Feb 25, 2019
13 checks passed
13 checks passed
gnome3.gnome-desktop on x86_64-darwin No attempt
Details
gnome3.gnome-desktop on aarch64-linux Success
Details
gnome3.gnome-desktop on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@hedning hedning mentioned this pull request Feb 25, 2019
2 of 2 tasks complete
@hedning hedning deleted the hedning:gnome-desktop-fix-thumbnailing branch Oct 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.