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

[20.09] blugon: fix build on darwin #101523

Merged
merged 1 commit into from
Oct 25, 2020
Merged

[20.09] blugon: fix build on darwin #101523

merged 1 commit into from
Oct 25, 2020

Conversation

r-burns
Copy link
Contributor

@r-burns r-burns commented Oct 24, 2020

Backport of #101515
(cherry picked from commit c58233a)

Motivation for this change

ZHF 20.09 #97479

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.

@r-burns
blugon: fix build on darwin
b7ce38c 
(cherry picked from commit c58233a)
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Oct 24, 2020
@ofborg ofborg bot requested a review from jumper149 October 24, 2020 02:13
SuperSandro2000
SuperSandro2000 reviewed Oct 24, 2020
View reviewed changes
pkgs/applications/misc/blugon/default.nix
@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {

buildInputs = [ python3 libX11 libXrandr ];

# Remove at next release
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# Remove at next release
# Remove with 1.12.2 release

or 1.13?

SuperSandro2000
SuperSandro2000 approved these changes Oct 24, 2020
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Builds on darwin and NixOS.

@jumper149
Copy link
Contributor

Hi, author of blugon here,

blugon was never intended for MacOS, as I personally have no clue of it and also no way to test anything.

Aside from that, does this commit jumper149/blugon@d262cd0 make blugon work on Darwin (not just build?).

I really have no idea of Darwins display server etc.

If so, then I would rather just make a new release for blugon, saving you this workaround.

@r-burns
Copy link
Contributor Author

r-burns commented Oct 24, 2020

That's fair, I guess I was thinking it could work for anyone running sessions in XQuartz, but I don't know how common that workflow is in practice. Disabling darwin seems fine especially if it's not an intended platform, so maybe I should close this and backport platforms.linux + platforms.bsd?

@jumper149
Copy link
Contributor

Well if there is a usecase for it I don't see a problem with making the derivation available to people.
If people have problems they will probably and hopefully let me know here https://github.com/jumper149/blugon/issues.

I will approve of this PR for now and if it's making too many problems I will probably disable it for darwin later on.

veprbl
veprbl approved these changes Oct 25, 2020
View reviewed changes
Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

Builds on x86_64-darwin

@veprbl veprbl merged commit a617a2f into NixOS:release-20.09 Oct 25, 2020
@r-burns r-burns deleted the backport-blugon branch October 25, 2020 03:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veprbl veprbl veprbl approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@jumper149 jumper149 jumper149 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@r-burns @jumper149 @veprbl @SuperSandro2000