wayland: fix cross #105103
Merged
wayland: fix cross #105103
+68
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flokli
added
the
6.topic: cross-compilation
|
Please target staging. |
| @@ -42,20 +57,32 @@ in stdenv.mkDerivation rec { | |||
|
|
|||
| depsBuildBuild = [ | |||
| pkgconfig | |||
| binutils | |||
There was a problem hiding this comment.
This is the diff is anyone is searching for it.
lukegb
approved these changes
Nov 27, 2020
There was a problem hiding this comment.
Before:
$ nix build -f . pkgsCross.aarch64-multiplatform.wayland
error: build of '/nix/store/69j04pdvzrjxkf34wfkvc1bhdqkcdssg-wayland-1.18.0-aarch64-unknown-linux-gnu.drv' on 'ssh://whitby' failed: builder for '/nix/store/69j04pdvzrjxkf34wfkvc1bhdqkcdssg-wayland-1.18.0-aarch64-unknown-linux-gnu.drv' failed with exit code 1
builder for '/nix/store/69j04pdvzrjxkf34wfkvc1bhdqkcdssg-wayland-1.18.0-aarch64-unknown-linux-gnu.drv' failed with exit code 1; last 10 log lines:
Build-time dependency wayland-scanner found: YES 1.18.0
Program /nix/store/xmkd03p5i7pzjxqvsngyflmlhjl7dmxj-wayland-1.18.0/bin/wayland-scanner found: YES (/nix/store/xmkd03p5i7pzjxqvsngyflmlhjl7dmxj-wayland-1.18.0/bin/wayland-scanner)
Library m found: YES
Run-time dependency threads found: YES
Program nm found: NO
egl/meson.build:14:0: ERROR: Program 'nm' not found
A full log can be found at /build/wayland-1.18.0/build/meson-logs/meson-log.txt
builder for '/nix/store/69j04pdvzrjxkf34wfkvc1bhdqkcdssg-wayland-1.18.0-aarch64-unknown-linux-gnu.drv' failed with exit code 1
[3 built (1 failed), 58 copied (977.7 MiB), 194.5 MiB DL]
error: build of '/nix/store/69j04pdvzrjxkf34wfkvc1bhdqkcdssg-wayland-1.18.0-aarch64-unknown-linux-gnu.drv' failed
After:
$ nix build -f . pkgsCross.aarch64-multiplatform.wayland
[4 built, 34 copied (837.4 MiB), 163.2 MiB DL]
|
See |
flokli
requested review from
adisbladis,
cdepillabout,
edolstra,
FRidh,
infinisil,
jonringer,
matthewbauer,
mmahut,
nbp,
peti,
Profpatsch,
RaghavSood,
roberth,
stigtsp and
ttuegel
as code owners
substituteInPlace stopped working, let's replace this with a patch which is more reliable.
flokli
force-pushed
the
nixos-cross-wayland
branch
from
c7b0793 to
f9e945e
Compare
flokli
removed request for
matthewbauer,
peti,
adisbladis,
cdepillabout,
stigtsp,
mmahut,
roberth,
ttuegel,
RaghavSood,
edolstra,
nbp,
FRidh,
Profpatsch,
codyopel,
primeos,
jonringer and
infinisil
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
meson needs to invoke nm from binutils during build
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)