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

tracy: 0.7 → 0.7.1 #96416

Merged
merged 1 commit into from Aug 31, 2020
Merged

tracy: 0.7 → 0.7.1 #96416

merged 1 commit into from Aug 31, 2020

Conversation

nagisa
Copy link
Contributor

@nagisa nagisa commented Aug 27, 2020

Motivation for this change

Tracy 0.7.1 was released a couple of days ago. https://github.com/wolfpld/tracy/releases/tag/v0.7.1

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.

@nagisa
Copy link
Contributor Author

nagisa commented Aug 27, 2020

cc @mpickering

@risicle
Copy link
Contributor

risicle commented Aug 31, 2020

This at least builds on macos (10.14) for me now (previously didn't), but doesn't run:

dyld: Library not loaded: libcapstone.4.dylib
  Referenced from: /Users/xxx/.cache/nixpkgs-review/pr-96416/results/tracy/bin/Tracy
  Reason: image not found
Abort trap: 6

Guess it's an improvement though.

@risicle
Copy link
Contributor

risicle commented Aug 31, 2020

Ok it works on macos if you add

  postFixup = lib.optionalString stdenv.isDarwin ''
    install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy
  '';

@nagisa
Copy link
Contributor Author

nagisa commented Aug 31, 2020

Yeah the macos build was fixed in wolfpld/tracy#56.

I added the fixupPhase invocation for macOS.

@risicle
Copy link
Contributor

risicle commented Aug 31, 2020

Ah right - of course the alternative fix would be to fetchpatch https://github.com/wolfpld/tracy/pull/56.patch

@risicle
Copy link
Contributor

risicle commented Aug 31, 2020

Anyway this'll do as long as someone remembers to remove the fixup in the next release.

@risicle risicle merged commit abfafe8 into NixOS:master Aug 31, 2020
@nagisa nagisa deleted the tracy071 branch August 31, 2020 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants