Skip to content

Fallout fixes from #50293 #50363

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
Merged
merged 4 commits into from
Nov 14, 2018
Merged

Fallout fixes from #50293 #50363

merged 4 commits into from
Nov 14, 2018
+7 −11

Conversation

matthewbauer
Copy link
Member

@matthewbauer matthewbauer commented Nov 14, 2018 •
edited
Loading

Motivation for this change

These are some fixes for issues that came up in #50293. Relevant eval is:

https://hydra.nixos.org/eval/1489555/

Still cannot find a fix for this one:

https://hydra.nixos.org/build/84072885/

@matthewbauer
xboxdrv: add dontUseSconsInstall flag
b6fce72 
xboxdrv doesn’t use scons for installing, but instead using a
makefile! Everything else is in scons so we have to keep that. I’ve
added a dontUseSconsInstall flag to the scons setup-hook to skip the
automatic overwrite of default “make install” call.
@matthewbauer
mapnik: use provided configure script
9cac8fe 
This gives us support for the class autoconf “./configure && make &&
make install” build-style.
@matthewbauer
dxx-rebirth: prevent infinite loop
d375193 
The postInstall phase should not run postInstall itself! My mistake in
renaming the old installPhase.
@matthewbauer
glib: only add gsettingsschemadir in make
df8ee06 
gsettingsschemedir only works in make where you can set any variable
from the command line as in “make VAR=VAL”. Other build systems may
not support this kind of loose overriding of variables. This broke a
scons build here:

  https://hydra.nixos.org/build/84073119/
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: dxx-rebirth, glib, mapnik, xboxdrv

Partial log (click to expand)

In file included from similar/main/render.cpp:33:0:
common/main/render_state.h: In function 'void d2x::render_mine(d2x::vcsegidx_t, dcx::fix, d2x::window_rendered_data&)':
common/main/render_state.h:20:9: error: '<anonymous>.render_state_t::per_segment_state_t::render_window' may be used uninitialized in this function [-Werror=maybe-uninitialized]
  struct per_segment_state_t
         ^~~~~~~~~~~~~~~~~~~
cc1plus: some warnings being treated as errors
scons: *** [similar/main/.d2x-rebirth.render.o] Error 1
scons: building terminated because of errors.
builder for '/nix/store/cdwiwx7g7iw0ybzv655g6y2cgqzcgvms-dxx-rebirth-0.59.100.drv' failed with exit code 2
error: build of '/nix/store/cdwiwx7g7iw0ybzv655g6y2cgqzcgvms-dxx-rebirth-0.59.100.drv', '/nix/store/yk582m4kj69kgyk5g7b0yw410g1z66z0-mapnik-3.0.21.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Attempted: dxx-rebirth, glib, mapnik, xboxdrv

Partial log (click to expand)

scons: done building targets.
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/hsgr6q6m2a55alp2ahwf7lrajn4njvkz-dxx-rebirth-0.59.100
shrinking /nix/store/hsgr6q6m2a55alp2ahwf7lrajn4njvkz-dxx-rebirth-0.59.100/bin/d1x-rebirth
shrinking /nix/store/hsgr6q6m2a55alp2ahwf7lrajn4njvkz-dxx-rebirth-0.59.100/bin/d2x-rebirth
strip is /nix/store/rpbg8gmqxhz8g61p1plz5d2srs84pvmv-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/hsgr6q6m2a55alp2ahwf7lrajn4njvkz-dxx-rebirth-0.59.100/bin
patching script interpreter paths in /nix/store/hsgr6q6m2a55alp2ahwf7lrajn4njvkz-dxx-rebirth-0.59.100
checking for references to /build in /nix/store/hsgr6q6m2a55alp2ahwf7lrajn4njvkz-dxx-rebirth-0.59.100...
error: build of '/nix/store/mgdggdqpgh7891g1zi5fhm12ywq08k0h-mapnik-3.0.21.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: glib, mapnik

The following builds were skipped because they don't evaluate on x86_64-darwin: dxx-rebirth, xboxdrv

Partial log (click to expand)

Install file: "fonts/dejavu-fonts-ttf-2.37/ttf/DejaVuSerifCondensed.ttf" as "/nix/store/0s792hfw5ps162qvsp3qlghyb0680lfb-mapnik-3.0.21/lib/mapnik/fonts/DejaVuSerifCondensed.ttf"
scons: done building targets.
glibPreFixupPhase
post-installation fixup
strip is /nix/store/rk3p99jbj4idl3dkkg1rxja5gz0qgs98-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/0s792hfw5ps162qvsp3qlghyb0680lfb-mapnik-3.0.21/lib  /nix/store/0s792hfw5ps162qvsp3qlghyb0680lfb-mapnik-3.0.21/bin
patching script interpreter paths in /nix/store/0s792hfw5ps162qvsp3qlghyb0680lfb-mapnik-3.0.21
/nix/store/0s792hfw5ps162qvsp3qlghyb0680lfb-mapnik-3.0.21/bin/mapnik-config: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/ixr5kls084hdlrs1wcy4c1q9fyw3rxfb-bash-4.4-p23/bin/bash"
/nix/store/plmkbq21375lm53pxpfvmhlbvfqk5awh-glib-2.56.0-bin
/nix/store/0s792hfw5ps162qvsp3qlghyb0680lfb-mapnik-3.0.21

@matthewbauer matthewbauer merged commit 3f0bd4c into NixOS:staging-next Nov 14, 2018
@matthewbauer matthewbauer deleted the cleanups3 branch February 22, 2019 04:22
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: 501+ 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@matthewbauer @GrahamcOfBorg