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

feh: fix cross #226081

Merged
1 commit merged into from Apr 14, 2023
Merged

feh: fix cross #226081

1 commit merged into from Apr 14, 2023

Conversation

ghost
Copy link

@ghost ghost commented Apr 13, 2023

Required to avoid:

   > aarch64-unknown-linux-gnu-gcc -g -O2 -Wall -Wextra -pedantic -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE -DHAVE_LIBCURL -DHAVE_MKSTEMPS -DHAVE_STRVERSCMP -DHAVE_LIBXINERAMA -DHAVE_LIBEXIF -DHAVE_INOTIFY -DPREFIX=\"/nix/store/8w2gzmyvg703wa9fj3vdpi87rcskan1f-feh-aarch64-unknown-linux-gnu-3.9\" -DPACKAGE=\"feh\" -DVERSION=\"\"   -c -o main.o main.c
   > In file included from main.c:34:
   > wallpaper.h:31:10: fatal error: X11/Intrinsic.h: No such file or directory
   >    31 | #include <X11/Intrinsic.h>      /* Xlib, Xutil, Xresource, Xfuncproto */
   >       |          ^~~~~~~~~~~~~~~~~
   > compilation terminated.
   > make[1]: *** [<builtin>: main.o] Error 1
   > make[1]: Leaving directory '/build/source/src'
   > make: *** [Makefile:6: build-src] Error 2

@uninsane uninsane added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Apr 13, 2023
@ofborg ofborg bot requested review from globin, Ma27, WilliButz and viric April 13, 2023 22:30
@uninsane
Copy link
Contributor

uninsane commented Apr 13, 2023

not working for me locally, when cherry-picked onto master. fails building the pkgsCross.aarch64-multiplatform.rav1e dep:

cargo:warning=cargo:warning=aarch64-unknown-linux-gnu-gcc: error: unrecognized command-line option '-m64'

possibly caused by a rust bump in the last staging-next -> master merge?

edit: oh, i see: this PR is implicitly dependent on #225360

Copy link
Contributor

@uninsane uninsane left a comment

Choose a reason for hiding this comment

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

with 225360 cherry-picked it does fix the pkgsCross.aarch64 build, and in the meantime it doesn't disrupt the x86_64 build so the ordering shouldn't matter 👍️

pkgs/applications/graphics/feh/default.nix Outdated Show resolved Hide resolved
Required to avoid:

   > aarch64-unknown-linux-gnu-gcc -g -O2 -Wall -Wextra -pedantic -std=c11 -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_DARWIN_C_SOURCE -DHAVE_LIBCURL -DHAVE_MKSTEMPS -DHAVE_STRVERSCMP -DHAVE_LIBXINERAMA -DHAVE_LIBEXIF -DHAVE_INOTIFY -DPREFIX=\"/nix/store/8w2gzmyvg703wa9fj3vdpi87rcskan1f-feh-aarch64-unknown-linux-gnu-3.9\" -DPACKAGE=\"feh\" -DVERSION=\"\"   -c -o main.o main.c
   > In file included from main.c:34:
   > wallpaper.h:31:10: fatal error: X11/Intrinsic.h: No such file or directory
   >    31 | #include <X11/Intrinsic.h>      /* Xlib, Xutil, Xresource, Xfuncproto */
   >       |          ^~~~~~~~~~~~~~~~~
   > compilation terminated.
   > make[1]: *** [<builtin>: main.o] Error 1
   > make[1]: Leaving directory '/build/source/src'
   > make: *** [Makefile:6: build-src] Error 2
@ghost ghost merged commit 02071dc into NixOS:master Apr 14, 2023
@ghost ghost deleted the pr/feh/fixcross branch April 14, 2023 18:38
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants