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.

Sign up for GitHub

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

Jump to bottom

gnomeExtensions.system-monitor: fix this package and upgrade to v33 #36410

Merged
merged 3 commits into from
Mar 28, 2018
Merged

gnomeExtensions.system-monitor: fix this package and upgrade to v33 #36410

merged 3 commits into from
Mar 28, 2018
+41 −6

Conversation

tiramiseb
Copy link
Contributor

Motivation for this change

Having a working extension :)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

See the mailing list for a discussion about the sessionPath parameter in gnome3 (https://groups.google.com/forum/#!topic/nix-devel/jJevoZx2ZFo)...

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Mar 7, 2018
bjornfor
bjornfor reviewed Mar 7, 2018
View reviewed changes
pkgs/desktops/gnome-3/extensions/system-monitor/default.nix Outdated

stdenv.mkDerivation rec {
name = "gnome-shell-system-monitor-${version}";
version = "8b31f070e9e59109d729661ced313d6a63e31787";
version = "v33";
Copy link
Contributor

Choose a reason for hiding this comment

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

For Nix to understand the version, it must start with a number. (Change this one to "33" and set rev = "v${version}"; below.)

bjornfor
bjornfor approved these changes Mar 7, 2018
View reviewed changes
Copy link
Contributor

@bjornfor bjornfor left a comment

Choose a reason for hiding this comment

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

Looks good. (Just nitpick about Nix version.)

@jtojnar
Copy link
Member

jtojnar commented Mar 7, 2018

Maybe it would be possible to patch the extension files to use g_irepository_prepend_search_path. Something like adding imports.gi.GIRepository.Repository.prepend_search_path('@GI_TYPELIB_PATH@') to the top of the extension.js file?

@tiramiseb
Copy link
Contributor Author

Thanks for the idea @jtojnar ! I will take a look.

@jtojnar
Copy link
Member

jtojnar commented Mar 7, 2018

Not sure how safe it is wrt conflicts (e.g one extension adds libfoo-X.Y.A and other adds libfoo-X.Y.B). Apparently, there is only one GI repository per process. Maybe try testing it.

@tiramiseb
Copy link
Contributor Author

I was going to try this approach, but I realized I don't know how I can retrieve the packages paths to include them with prepend_search_path...

@jtojnar
Copy link
Member

jtojnar commented Mar 11, 2018

You could use patches with substituteAll:

nixpkgs/pkgs/applications/misc/orca/default.nix

Lines 24 to 29 in 7c4886d

patches = [
(substituteAll {
src = ./fix-paths.patch;
xkbcomp = "${xkbcomp}/bin/xkbcomp";
})
];

@tiramiseb
Copy link
Contributor Author

Great, thanks @jtojnar !
I have done it, and tested it. It works perfectly.

@jtojnar jtojnar mentioned this pull request Mar 14, 2018
Closed
@7c6f434c 7c6f434c merged commit 52f9d29 into NixOS:master Mar 28, 2018
@jtojnar jtojnar mentioned this pull request Apr 3, 2018
Closed
@tiramiseb tiramiseb deleted the gnome-shell-extension-system-monitor branch May 14, 2018 06:22
@tiramiseb tiramiseb mentioned this pull request May 14, 2018
Closed
@jtojnar jtojnar mentioned this pull request Jun 18, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjornfor bjornfor

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@tiramiseb @jtojnar @bjornfor @7c6f434c @GrahamcOfBorg