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

at-spi2-core: provide fallback dbus_daemon manually #66634

Merged

Conversation

@matthewbauer
Copy link
Member

commented Aug 14, 2019

This points directly to the NixOS current-system. This is necessary to
avoid creating a direct dependency on DBUS and increasing every app’s
runtime closure. Luckily, dbus_daemon is only used for the case when
dbus is not running and users can always run the dbus-daemon
themselves if it cannot be found.

Motivation for this change
Things done
  • 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 nix-review --run "nix-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

at-spi2-core: provide fallback dbus_daemon manually
This point directly to the NixOS current-system. This is necessary to
avoid creating a direct dependency on DBUS and increasing every app’s
runtime closure. Luckily, dbus_daemon is only used for the case when
dbus is not running and users can always run the dbus-daemon
themselves if it cannot be found.
@matthewbauer

This comment has been minimized.

Copy link
Member Author

commented Aug 14, 2019

This gets the closure of at-spi2-core from 145M to 58M:

36K	/nix/store/z9c50w00y7knb3f13rnrsldb4swvhjvs-libcap-2.27-lib
44K	/nix/store/khw0pddjxljm04k3ssfbx7ii3pyq4vh1-libXdmcp-1.1.3
56K	/nix/store/msrifpln7dxr6sxkbnhjynjsalgvqbjr-libSM-1.2.3
64K	/nix/store/mppjwxsqh2jfzsy06zqwpwra1dcn66f2-libffi-3.2.1
80K	/nix/store/4mj4wmhy664yjxwp57766vcr770jn798-libXau-1.0.9
92K	/nix/store/p9vc77mk6sz7kk0ga7mzk8rzl9avimqf-libXi-1.7.9
108K	/nix/store/ld1awxg8k5aaxndi5i8qcj8ml0yjdb8g-libXext-1.3.4
128K	/nix/store/r6k7lcly1c7ij7xsq16y3dbx5xkw0j9r-libICE-1.0.9
152K	/nix/store/w3wqang215is14xqajycbxmd52b44qkw-zlib-1.2.11
220K	/nix/store/v14crwgs8x6sfmqsfx2ibsqngr9p9pk7-libXtst-1.2.3
408K	/nix/store/ji9kpgmbddkv2l2szzjfqinhja2322k0-xz-5.2.4
468K	/nix/store/b7wk4z5dj5rbwykj0lybymj954jdnmx7-dbus-1.12.16-lib
504K	/nix/store/1y0svafx9vypz073nqnq7qlhssrflqr4-pcre-8.43
556K	/nix/store/dzxjjbjl12zmyl52mb58pb9ji4d1271z-lz4-1.9.1
584K	/nix/store/5n1m1j1mzhzvp14nzialy50mrglnp9bm-libselinux-2.7
932K	/nix/store/dl2syaby2kk608dxj3pfzxpgkv8k02d2-libgpg-error-1.36
1.3M	/nix/store/hmdkg399f3y3x0ffxmy0qqx8hz11sm9k-libgcrypt-1.8.4
1.4M	/nix/store/hd2lb4z71awqyrm8h3mirx1rma9iy85q-at-spi2-core-2.32.1
1.5M	/nix/store/vsh5fm04m6wk1pxdgk9p66sqgnpi7wya-libxcb-1.13.1
1.7M	/nix/store/37rzlcp0v8c9ifmbjix17g5rfk4lrvnp-util-linux-2.33.2
2.0M	/nix/store/f7047cy1jywmw3wfwv57fs7jgqzsclcs-systemd-242-lib
3.5M	/nix/store/fz6s5xxd1c6wgfm9c3g2dz0hnjj1nqn6-libX11-1.6.7
14M	/nix/store/czgfkfnzrgxpk690rrgm7mfwl8gxnnjy-glib-2.60.4
30M	/nix/store/iykxb0bmfjmi7s53kfg6pjbfpd8jmza6-glibc-2.27
58M	total

Should fix #62421

@worldofpeace

This comment has been minimized.

Copy link
Member

commented Aug 14, 2019

Excellent @matthewbauer, sounds good to me 👍

@matthewbauer matthewbauer changed the base branch from master to staging Aug 20, 2019

@matthewbauer matthewbauer merged commit d02e0b6 into NixOS:staging Aug 20, 2019

16 checks passed

Evaluation Performance Report Evaluator Performance Report
Details
at-spi2-core on aarch64-linux Success
Details
at-spi2-core on x86_64-darwin Success
Details
at-spi2-core 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-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.