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

hsetroot: fix darwin build #123219

Merged
merged 1 commit into from May 17, 2021
Merged

hsetroot: fix darwin build #123219

merged 1 commit into from May 17, 2021

Conversation

stephank
Copy link
Contributor

Motivation for this change

ZHF: #122042
cc @NixOS/nixos-release-managers

Hydra failure: https://hydra.nixos.org/build/141637618/nixlog/1

Not sure what to do with upstreaming here. I'd have to figure out the Makefile syntax for it.

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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label May 16, 2021
@ofborg ofborg bot requested review from henrytill and SCOTT-HAMILTON May 16, 2021 10:33
@SCOTT-HAMILTON
Copy link
Contributor

SCOTT-HAMILTON commented May 16, 2021 •
edited

Could you maybe try this patch instead : https://gist.github.com/SCOTT-HAMILTON/e1a76964698328d6afbb90179a72fa59

PS : I don't have a macos machine to test this on.

jonringer
jonringer approved these changes May 17, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 123219 run on x86_64-linux 1

1 package built:
  • hsetroot

@jonringer jonringer merged commit eec3738 into NixOS:master May 17, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@henrytill henrytill Awaiting requested review from henrytill

@SCOTT-HAMILTON SCOTT-HAMILTON Awaiting requested review from SCOTT-HAMILTON

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.

None yet
3 participants
@stephank @SCOTT-HAMILTON @jonringer