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

xpointerbarrier: init at 17.10 #30721

Merged
merged 2 commits into from Oct 25, 2017
Merged

xpointerbarrier: init at 17.10 #30721

merged 2 commits into from Oct 25, 2017

Conversation

xzfc
Copy link
Contributor

@xzfc xzfc commented Oct 23, 2017

Motivation for this change

This utility may be useful for multi-monitor setups.
Also, add myself to maintainers.nix.

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.

@xzfc xzfc requested a review from edolstra as a code owner October 23, 2017 13:03
disassembler
disassembler suggested changes Oct 23, 2017
View reviewed changes
Copy link
Member

@disassembler disassembler left a comment

Choose a reason for hiding this comment

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

Thanks for submitting this! A couple quick changes and I think this is good to go.

pkgs/tools/X11/xpointerbarrier/default.nix Outdated
name = "xpointerbarrier-${version}";
version = "17.10";

src = fetchurl {
Copy link
Member

Choose a reason for hiding this comment

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

Can we use fetchFromGitHub here instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure. I've amended commit.

pkgs/tools/X11/xpointerbarrier/default.nix

buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ];

makeFlags = "prefix=$(out)";
Copy link
Member

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. Does it fail to build without this line?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes it fails. I guess default have uppercase PREFIX.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, just looked at the code and this doesn't use a configure script, makes sense now.

disassembler
disassembler approved these changes Oct 23, 2017
View reviewed changes
Copy link
Member

@disassembler disassembler left a comment

Choose a reason for hiding this comment

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

nox-review passes. Tested running result/bin/xpointerbarrier 0 0 1000 1000 -v and it successfully traps the cursor in the area.

@fpletz fpletz merged commit 6df1ccc into NixOS:master Oct 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@disassembler disassembler disassembler approved these changes

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@xzfc @disassembler @fpletz