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

sc-controller: fix broken svg icons #100254

merged 1 commit into from Oct 12, 2020

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)

This comment has been minimized.

@jtojnar

jtojnar Oct 11, 2020
Contributor

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

This comment has been minimized.

@rnhmjoj

rnhmjoj Oct 11, 2020
Author Contributor

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

This comment has been minimized.

@rnhmjoj

rnhmjoj Oct 11, 2020
Author Contributor

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 rnhmjoj force-pushed the rnhmjoj:sc-controller branch from e7c52a7 to 65cbea4 Oct 12, 2020
@rnhmjoj
Copy link
Contributor Author

@rnhmjoj 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
19 of 20 checks passed
19 of 20 checks passed
@github-actions
tests tests
Details
@github-actions
action
Details
@ofborg
sc-controller, sc-controller.passthru.tests on x86_64-darwin
Details
@ofborg
Evaluation Performance Report Evaluator Performance Report
Details
@github-actions
Wait for ofborg
Details
@ofborg
grahamcofborg-eval ^.^!
Details
@ofborg
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
@ofborg
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
@ofborg
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="65cbea4"; rev="65cbea456365776e3f5bea2e926e23eff24d13f5"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
@ofborg
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="65cbea4"; rev="65cbea456365776e3f5bea2e926e23eff24d13f5"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="65cbea4"; rev="65cbea456365776e3f5bea2e926e23eff24d13f5"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="65cbea4"; rev="65cbea456365776e3f5bea2e926e23eff24d13f5"; } ./nixos/
Details
@ofborg
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="65cbea4"; rev="65cbea456365776e3f5bea2e926e23eff24d13f5"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="65cbea4"; rev="65cbea456365776e3f5bea2e926e23eff24d13f5"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="65cbea4"; rev="65cbea456365776e3f5bea2e926e23eff24d13f5"; } ./pkgs/t
Details
@ofborg
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
@ofborg
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@ofborg
sc-controller, sc-controller.passthru.tests on aarch64-linux Success
Details
@ofborg
sc-controller, sc-controller.passthru.tests on x86_64-linux Success
Details
@rnhmjoj
Copy link
Contributor Author

@rnhmjoj rnhmjoj commented Oct 12, 2020

Backport ca3477e

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

2 participants