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

vkquake: fix build #46391

Merged
merged 1 commit into from Sep 9, 2018
Merged

vkquake: fix build #46391

merged 1 commit into from Sep 9, 2018

Conversation

tadfisher
Copy link
Contributor

Motivation for this change

vulkan-loader.dev doesn't generate include/vulkan.h which this needs. Not sure when that changed.

Added vulkan-headers to nativeBuildInputs and moved makeWrapper there as well.

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.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: vkquake

Partial log (click to expand)

install flags: SHELL=/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/bash prefix=\$\(out\) bindir=\$\(out\)/bin install
install /build/source/Quake/vkquake /nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0/bin/vkquake
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0
shrinking /nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0/bin/vkquake
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0/bin
patching script interpreter paths in /nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0
checking for references to /build in /nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0...
/nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vkquake

Partial log (click to expand)

install flags: SHELL=/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash prefix=\$\(out\) bindir=\$\(out\)/bin install
install /build/source/Quake/vkquake /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0/bin/vkquake
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0
shrinking /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0/bin/vkquake
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0/bin
patching script interpreter paths in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0
checking for references to /build in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0...
/nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0

@Mic92
Copy link
Member

Mic92 commented Sep 9, 2018

@GrahamcOfBorg build vkquake

@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: vkquake

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: vkquake

Partial log (click to expand)

/nix/store/3bbnq39197w4a674vczv5ksjfp1r44qd-vkquake-1.00.0

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: vkquake

Partial log (click to expand)

install flags: SHELL=/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/bash prefix=\$\(out\) bindir=\$\(out\)/bin install
install /build/source/Quake/vkquake /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0/bin/vkquake
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0
shrinking /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0/bin/vkquake
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0/bin
patching script interpreter paths in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0
checking for references to /build in /nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0...
/nix/store/ba4kwymdf4p1b200g1nzmfbibsgp93an-vkquake-1.00.0

@Mic92 Mic92 merged commit 7069eb7 into NixOS:master Sep 9, 2018
@Mic92
Copy link
Member

Mic92 commented Sep 9, 2018

backport:

[detached HEAD 3dc8898] vkquake: fix build
Author: Tad Fisher tadfisher@gmail.com
Date: Sat Sep 8 13:13:23 2018 -0700
1 file changed, 7 insertions(+), 2 deletions(-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
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
3 participants
@tadfisher @GrahamcOfBorg @Mic92