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

sc-controller: fix broken svg icons #100254

Merged
merged 1 commit into from Oct 12, 2020
Merged

Conversation

rnhmjoj
Copy link
Contributor

@rnhmjoj rnhmjoj commented Oct 11, 2020

Motivation for this change

See #98116

Things done
  • Tested using sandboxing (nix.useSandbox on 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
  • Tested compilation of all pkgs that depend on this change
  • Tested execution of all binary files
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc: @orivej @timjrd

@@ -34,6 +35,7 @@ buildPythonApplication rec {

preFixup = ''
gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH")
gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache)
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be the default. Maybe strictDeps are interfering like in #56943.

Copy link
Contributor Author

@rnhmjoj rnhmjoj Oct 11, 2020

Choose a reason for hiding this comment

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

I found this commit 6c5983a to be the cause while bisecting, maybe it means something to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like you're right: settings strictDeps is working.

The gdk-pixbuf module exposed by librsvg wasn't detected
due to strictDeps being enabled by default in python packages.
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 12, 2020

I'm going ahead and merge this early because the software is broken in release-20.09.

@rnhmjoj rnhmjoj merged commit a5f01cb into NixOS:master Oct 12, 2020
@rnhmjoj
Copy link
Contributor Author

rnhmjoj commented Oct 12, 2020

Backport ca3477e

@rnhmjoj rnhmjoj deleted the sc-controller branch July 10, 2023 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants