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

renderdoc: 0.91 -> 1.0 #43159

Merged
merged 1 commit into from Jul 14, 2018
Merged

renderdoc: 0.91 -> 1.0 #43159

merged 1 commit into from Jul 14, 2018

Conversation

Ralith
Copy link
Contributor

@Ralith Ralith commented Jul 8, 2018

Motivation for this change

Features, bugfixes. Debugged and squashed version of #36761.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Fits CONTRIBUTING.md.

@Ralith
Copy link
Contributor Author

Ralith commented Jul 8, 2018

There's probably a way to make this work with less copying, but I went for the minimum amount of changes on top of @jansol's.

infinisil
infinisil reviewed Jul 8, 2018
View reviewed changes
pkgs/applications/graphics/renderdoc/default.nix Outdated
"-DRENDERDOC_SWIG_PACKAGE=${custom_swig}"
# TODO: add once pyside2 is in nixpkgs
#"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}"
"-DVULKAN_LAYER_FOLDER=${placeholder "out"}/share/vulkan/implicit_layer.d/"
Copy link
Member

Choose a reason for hiding this comment

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

placeholder still can't be used, #37875

infinisil
infinisil reviewed Jul 8, 2018
View reviewed changes
pkgs/applications/graphics/renderdoc/default.nix Outdated
nativeBuildInputs = [ autoreconfHook pcre ];

autoreconfPhase = ''
phases = ["unpackPhase" "patchAndMove"];
Copy link
Member

Choose a reason for hiding this comment

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

Setting phases directly considered harmful, you could use patchPhase for the shebangs and installPhase for the tar.

@Ralith
Copy link
Contributor Author

Ralith commented Jul 8, 2018

Thanks for the review! Addressed the issues with some simplifications. I'm not particularly happy with the chmod hack; is there a reasonable stdenvy way to copy a bunch of files while making them writable but not otherwise modifying their permissions?

infinisil
infinisil approved these changes Jul 8, 2018
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

Maybe a normal cp & chmod +w would be better, which would indicate that it actually needs write permissions, instead of "abusing" the --no-preserve of cp. Ultimately it doesn't matter much though ;)

@jansol jansol mentioned this pull request Jul 8, 2018
Closed
8 tasks
@jansol
Copy link
Contributor

jansol commented Jul 8, 2018

Where is debuggable-swig-build.patch? I don't see it in the PR's change list.

@Ralith
Copy link
Contributor Author

Ralith commented Jul 8, 2018

Whoops, that wasn't supposed to go up.

infinisil
infinisil reviewed Jul 11, 2018
View reviewed changes
pkgs/applications/graphics/renderdoc/default.nix Outdated

src = fetchFromGitHub {
owner = "baldurk";
repo = "renderdoc";
rev = "2d8b2cf818746b6a2add54e2fef449398816a40c";
sha256 = "07yc3fk7j2nqmrhc4dm3v2pgbc37scd7d28nlzk6v0hw99zck8k0";
rev = "v1.0";
Copy link
Member

Choose a reason for hiding this comment

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

v${version}

@Ralith
Copy link
Contributor Author

Ralith commented Jul 13, 2018

Tweaked as requested.

@xeji
Copy link
Contributor

xeji commented Jul 14, 2018

@GrahamcOfBorg build renderdoc

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: renderdoc

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: renderdoc

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: renderdoc

Partial log (click to expand)

shrinking /nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0/bin/.renderdoccmd-wrapped
shrinking /nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0/bin/.qrenderdoc-wrapped
shrinking /nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0/lib/librenderdoc.so
strip is /nix/store/4qvrxzxa535y8304mk195x50b6p9607d-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0/lib  /nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0/bin
patching script interpreter paths in /nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0
checking for references to /build in /nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0...
postPatchMkspecs
postPatchMkspecs
/nix/store/5a53r6wjbbhpqawvxbdpg0xr3j30iqjj-renderdoc-1.0

@xeji xeji merged commit 3ee321d into NixOS:master Jul 14, 2018
@Ralith Ralith deleted the renderdoc branch August 2, 2018 16:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil approved these changes

Assignees
No one assigned
Labels
8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Ralith @jansol @xeji @GrahamcOfBorg @infinisil