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: init at version 0.34pre #23769

Merged
merged 2 commits into from Mar 21, 2017
Merged

renderdoc: init at version 0.34pre #23769

merged 2 commits into from Mar 21, 2017

Conversation

jansol
Copy link
Contributor

@jansol jansol commented Mar 11, 2017

Initialising a few commits after the latest release due to some upstream
improvements to the build system.

Motivation for this change

It was missing. It's also a great app needed by multiple people, including me.

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
    • Linux
  • 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.

@mention-bot
Copy link

@jansol, thanks for your PR! By analyzing the history of the files in this pull request, we identified @zimbatm, @zraexy and @peti to be potential reviewers.

@Ralith
Copy link
Contributor

Ralith commented Mar 11, 2017

Thanks for putting this together! One question: Is vulkan-loader needed for renderdoc to debug vulkan use? If so, presumably it needs to actually be referenced somehow in the package (added to the rpath after unused paths are deleted?). If not, it should be removed from the package's arguments.

@Ralith
Copy link
Contributor

Ralith commented Mar 11, 2017

After discussion in #renderdoc it sounds like ${vulkan-loader}/lib needs to go in the binary's rpath (in which case you'll have to be careful it doesn't get stripped as unused) or be added by the wrapper to LD_LIBRARY_PATH.

sha256 = "1zpvjvsj5c441kyjpmd2d2r0ykb190rbq474nkmp1jk72cggnpq0";
};

buildInputs = [ cmake qtbase git pkgconfig xorg.libpthreadstubs xorg.libXdmcp qtx11extras ];
Copy link
Contributor

Choose a reason for hiding this comment

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

cmake, pkgconfig would go into nativeBuildInputs. Git should not be specified as a dependency

@jansol
Copy link
Contributor Author

jansol commented Mar 13, 2017

I'm not 100% sure if those patchelf invocations are the right thing to do, but it appears to work. (as in, creating and opening vulkan captures with them succeeds, whereas it fails without them)

@Ralith
Copy link
Contributor

Ralith commented Mar 13, 2017

That seems like a reasonable solution, though I may be wrong.

Would it make sense to remove the LD_LIBRARY_PATH munging and do the same rpath magic for librenderdoc? It's a minor quibble, as either works, but consistency is nice.

@Ralith
Copy link
Contributor

Ralith commented Mar 13, 2017

Actually, is DT_NEEDED meant to be used with absolute paths? My intuition says you're just supposed to have filenames there and let the rpath sort out the location.

src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";

Copy link
Contributor

Choose a reason for hiding this comment

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

Get rid of the empty space between repo and rev


meta = with stdenv.lib; {
description = "A single-frame graphics debugger";
homepage = "https://renderdoc.org/";
Copy link
Contributor

Choose a reason for hiding this comment

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

Can remove the quotes around url

Initialising a few commits after the latest release due to some upstream
improvements to the build system.
@Mic92 Mic92 merged commit f9e688e into NixOS:master Mar 21, 2017
@Mic92
Copy link
Member

Mic92 commented Mar 21, 2017

Thanks!

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

7 participants