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

weechat: Fix build on Darwin #75785

Merged
merged 1 commit into from Dec 20, 2019
Merged

weechat: Fix build on Darwin #75785

merged 1 commit into from Dec 20, 2019

Conversation

@eraserhd
Copy link
Contributor

@eraserhd eraserhd commented Dec 16, 2019

Motivation for this change

The weechat version update from 8 days ago broke building on Darwin for two reasons.

First, gettext is necessary to build on Darwin.

Second, the tcl derivation assumes dll names end in .so on every platform, causing it to make a dangling symlink on Darwin. The weechat changelog indicates that they change how they detect the TCL library -- as a result, weechat attempted to link against the dangling symlink and failed.

Things done

I was careful to ensure the TCL derivation evaluate the same on Linux.

  • 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 nix-review --run "nix-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.
Notify maintainers

weechat: cc @lovek323 @the-kenny @lheckemann @Ma27
tcl: @vrthra

@andir
Copy link
Member

@andir andir commented Dec 17, 2019

I think this should be split in two commits. The TCL change on darwin looks isolated from the weechat change. Probably a good idea to move this through staging first as well.

@eraserhd eraserhd changed the title weechat: Fix build on Darwin (includes TCL fix) weechat: Fix build on Darwin Dec 19, 2019
@eraserhd eraserhd force-pushed the eraserhd:weechat-darwin-fix branch from f355172 to 67bed0c Dec 19, 2019
@eraserhd
Copy link
Contributor Author

@eraserhd eraserhd commented Dec 19, 2019

@andir I split out #75947 and removed the tcl fix from this branch. This won't build on Mac until it is merged, though.

@marsam marsam merged commit 33e87b0 into NixOS:master Dec 20, 2019
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
weechat on aarch64-linux Success
Details
weechat on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.