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

renderdoc: Fixes build with missing SWIG_PACKAGE #32230

Merged
merged 1 commit into from Dec 29, 2017

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Dec 1, 2017

Motivation for this change

Required by nox-review for #32100

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.

nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison autoconf automake pcre ];

SWIG_PACKAGE = fetchurl {
url = "https://github.com/baldurk/swig/archive/renderdoc-modified-1.zip";
sha256 = "0xxvkkaa5rp2xnnms6i1i4kbvq9fj3is0kiawwdix4hfys16m4mz";
Copy link
Member

Choose a reason for hiding this comment

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

Is this url stable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

These tarballs are generated by github. On regeneration they might change also the content does not change. Therefor it is required fetchzip or even better fetchFromGitHub, which is a wrapper around fetchzip.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay, I already tried fetchFromGitHub, but gave up after some tries. I will try again, I think I have an idea was is wrong.

Copy link
Contributor

Choose a reason for hiding this comment

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

@bkchr What errors did you encounter?

@bkchr
Copy link
Contributor Author

bkchr commented Dec 27, 2017

@Mic92 @joachifm, sorry for taking that long to update the pull request. Now it works and uses fetchFromGitHub.

@bkchr bkchr force-pushed the renderdoc branch 2 times, most recently from dacc8ef to 29d0f99 Compare December 27, 2017 23:00
@bkchr
Copy link
Contributor Author

bkchr commented Dec 29, 2017

Reminder for @Mic92

@joachifm joachifm merged commit 56518ff into NixOS:master Dec 29, 2017
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

4 participants