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

Fix/vscode dbusmenu support #79886

Closed
wants to merge 1,990 commits into from
Closed

Conversation

@brcha
Copy link

@brcha brcha commented Feb 12, 2020

Motivation for this change

I wanted to enable global menus (appmenus, unity menus, dbusmenus, …) for VSCode and VSCodium. It's worth mentioning the issue: #65680

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.

As can be seen on the following screenshot, I've built the VSCode package and it now works with DBusMenus as it should. The only thing I did was to add libdbusmenu-gtk3 to dependencies in several places in the file. I've also tried to honor the Darwin target by adding libdbusmenu-gtk3 only where it didn't apply to Darwin, but, since I don't have a Mac to test this change, nor am I overly versed in Nix{,OS,Pkgs,…} ecosystem, I implore you to check that before accepting this push request. I'm guessing libdbusmenu doesn't work in Mac to provide global menus, but perhaps I'm wrong about that.

Screenshot_20200212_032522

As suggested by the nixpkgs manual I've made a patch for the branch I'm currently using, stable 19.09, tag c49da64. That is a bit strange approach to me, usually patches are made for master, but I don't think there should be too much difference between this patch and the patch to master, when this concrete file is concerned.

kalbasit and others added 30 commits Jan 4, 2020
…#76951)

(cherry picked from commit 2f22e67)
…r19.09

[r19.09] cyrus_sasl: add patch for CVE-2019-19906
(cherry picked from commit 0afc845)
(cherry picked from commit af5f1eb)
(cherry picked from commit 727f2e9)
(cherry picked from commit 482b39a)
(cherry picked from commit 787a7f6)
(cherry picked from commit 39cd457)
Backport of #75182
apache-kafka.nix: Add missing quote inside tmpfiles rule
(cherry picked from commit 2d6f1ff)
(cherry picked from commit 754d02d)
It's safe: it just installs a new file into otherwise unused output.
Tested nixos.tests.gdk-pixbuf.x86_64-linux
Traceback (most recent call last):
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/bin/.swift-wrapped", line 7, in <module>
    from swiftclient.shell import main
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/lib/python3.7/site-packages/swiftclient/__init__.py", line 20, in <module>
    from .client import *  # noqa
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/lib/python3.7/site-packages/swiftclient/client.py", line 33, in <module>
    from swiftclient import version as swiftclient_version
  File "/nix/store/8qkdlyv2ckrimvi50qvl0anzv66jcp2j-python-swiftclient-3.6.0/lib/python3.7/site-packages/swiftclient/version.py", line 15, in <module>
    import pkg_resources
ModuleNotFoundError: No module named 'pkg_resources'

(cherry picked from commit dfd115a)
(cherry picked from commit 3b15451)
(cherry picked from commit 2ad59bd)
[19.09] firefox: 71.0 -> 72.0
(cherry picked from commit 3f0fee7)
(cherry picked from commit 603e3b1)
@brcha
Copy link
Author

@brcha brcha commented Feb 12, 2020

I'm guessing the manual needs updating… it makes absolutely no sense making a PR like this, based on an old (stable) tag.

@brcha brcha closed this Feb 12, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Feb 12, 2020

git rebase --onto master HEAD^

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.