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

cataclysm-dda{,-git}: fix share directory #34144

Merged
merged 3 commits into from
Jan 24, 2018
Merged

cataclysm-dda{,-git}: fix share directory #34144

merged 3 commits into from
Jan 24, 2018
+10 −16

Conversation

mnacamura
Copy link
Contributor

@mnacamura mnacamura commented Jan 22, 2018 •
edited
Loading

Motivation for this change

So far, the data (mods, tile sets, etc.) have been put into $out/share. This is weird. They should be in $out/share/cataclysm-dda.
Then, no need to wrap the binary because $out/share/cataclysm-dda is the default data path.

Moreover, fixed to install missing translations.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
  • 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/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@mnacamura mnacamura changed the title cataclysm-dda{,git}: fix share directory cataclysm-dda{,-git}: fix share directory Jan 22, 2018
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 22, 2018
@mnacamura
cataclysm-dda{,-git}: fix share directory
fc06a98 
Data should be in PREFIX/share/cataclysm-dda instead of PREFIX/share.
@mnacamura
cataclysm-dda{,-git}: no need for wrapper anymore
ee6086c
@mnacamura
cataclysm-dda-git: install missing translations
bd9b51f 
Using gettext without translation files is just like driving a car without wheels.
@mnacamura
Copy link
Contributor Author

All set.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 1-10 and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin labels Jan 22, 2018
rnhmjoj
rnhmjoj approved these changes Jan 23, 2018
View reviewed changes
Copy link
Contributor

@rnhmjoj rnhmjoj left a comment

Choose a reason for hiding this comment

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

I get an error when changing tilesets
error
It seems present before your changes and not in the -git version so it's probably an upstream issue.

Thank you.

@mnacamura
Copy link
Contributor Author

My pleasure. I'm grad to hear that.

@Mic92
Copy link
Member

Mic92 commented Jan 24, 2018

@GrahamcOfBorg build cataclysm-dda cataclysm-dda-git

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Jan 24, 2018

I can confirm both packages build on NixOS x86_64 at least.

GrahamcOfBorg
GrahamcOfBorg reviewed Jan 24, 2018
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

                   LICENSE.txt -t /nix/store/pwm9vvgvx34d1y5w0dr7q7rbvlv9n222-cataclysm-dda-git-2017-12-09/share/cataclysm-dda/
mkdir -p /nix/store/pwm9vvgvx34d1y5w0dr7q7rbvlv9n222-cataclysm-dda-git-2017-12-09/share/locale
LOCALE_DIR=/nix/store/pwm9vvgvx34d1y5w0dr7q7rbvlv9n222-cataclysm-dda-git-2017-12-09/share/locale lang/compile_mo.sh all
post-installation fixup
strip is /nix/store/i1zz228nl3bljcbb83fq0rq7lr7nvv4y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/pwm9vvgvx34d1y5w0dr7q7rbvlv9n222-cataclysm-dda-git-2017-12-09/bin
patching script interpreter paths in /nix/store/pwm9vvgvx34d1y5w0dr7q7rbvlv9n222-cataclysm-dda-git-2017-12-09
/nix/store/pwm9vvgvx34d1y5w0dr7q7rbvlv9n222-cataclysm-dda-git-2017-12-09/Applications/Cataclysm.app/Contents/MacOS/Cataclysm.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4cvvpbqdkrb0hr4p47q3s9l2a6k04y1g-bash-4.4-p12/bin/sh"
/nix/store/ssbcgiqqmwaffwg1qs6idc4nm146h8nb-cataclysm-dda-0.C
/nix/store/pwm9vvgvx34d1y5w0dr7q7rbvlv9n222-cataclysm-dda-git-2017-12-09

@mnacamura
Copy link
Contributor Author

Today I tested it on a NixOS box (build succeeded) and found that gettext works for the git version but does not for version 0.C. On macOS, it works for both 0.C and git versions. Needs more investigation. Though another problem found, this PR itself can be merged, I think.

GrahamcOfBorg
GrahamcOfBorg reviewed Jan 24, 2018
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: aarch64-linux

g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c iuse_test.cpp -o obj/tiles/iuse_test.o
g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c monster_test.cpp -o obj/tiles/monster_test.o
g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c morale_test.cpp -o obj/tiles/morale_test.o
g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c vehicle_turrets.cpp -o obj/tiles/vehicle_turrets.o
g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c wield_times_test.cpp -o obj/tiles/wield_times_test.o
g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c shadowcasting_test.cpp -o obj/tiles/shadowcasting_test.o
g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c name_test.cpp -o obj/tiles/name_test.o
g++ -DRELEASE -DTILES -DLOCALIZE -DPREFIX="/nix/store/9rrplrmjjzjqpxwxw120ay93klhmrviz-cataclysm-dda-git-2017-12-09" -DDATA_DIR_PREFIX -DUSE_HOME_DIR -ffast-math -Os -Wall -Wextra -fsigned-char -std=c++11 -MMD -MP -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -DSDL_SOUND -I/nix/store/vh1yxzs656grarqvgpslqf7zjn81750d-lua-5.2.3/include -DLUA -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I/nix/store/7ykhkgws4zcx9iqx0xpnn1bx73q487k1-SDL2_mixer-2.0.2/include/SDL2 -D_REENTRANT -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/b63jnk3j096jf2wg23bgz9cwkqy1h5s3-SDL2_image-2.0.2/include/SDL2 -D_REENTRANT -I/nix/store/dpy97pfjypxiilsb88dmk8c2va2cnadv-SDL2-2.0.7-dev/include/SDL2 -I/nix/store/5mmg1z9r5wyrnzfyr66gb0vw2nzwkpsh-SDL2_ttf-2.0.14/include/SDL2 -I../src -Wno-unused-variable -Wno-sign-compare -Wno-unknown-pragmas -Wno-parentheses -MMD -MP -c crafting_test.cpp -o obj/tiles/crafting_test.o
building of '/nix/store/1afsy131agm01d4gglwzkskdl5wbgc8v-cataclysm-dda-git-2017-12-09.drv' timed out after 3600 seconds
error: build of '/nix/store/1afsy131agm01d4gglwzkskdl5wbgc8v-cataclysm-dda-git-2017-12-09.drv' failed

@Mic92 Mic92 merged commit bb7e244 into NixOS:master Jan 24, 2018
GrahamcOfBorg
GrahamcOfBorg reviewed Jan 24, 2018
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

LOCALE_DIR=/nix/store/g38v05w70qinaf9f42kspvb5814sf9vb-cataclysm-dda-git-2017-12-09/share/locale lang/compile_mo.sh all
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/g38v05w70qinaf9f42kspvb5814sf9vb-cataclysm-dda-git-2017-12-09
shrinking /nix/store/g38v05w70qinaf9f42kspvb5814sf9vb-cataclysm-dda-git-2017-12-09/bin/cataclysm-tiles
strip is /nix/store/mdyy001q67hiks0g24ra53z7ckm4jfr4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/g38v05w70qinaf9f42kspvb5814sf9vb-cataclysm-dda-git-2017-12-09/bin 
patching script interpreter paths in /nix/store/g38v05w70qinaf9f42kspvb5814sf9vb-cataclysm-dda-git-2017-12-09
checking for references to /tmp/nix-build-cataclysm-dda-git-2017-12-09.drv-0 in /nix/store/g38v05w70qinaf9f42kspvb5814sf9vb-cataclysm-dda-git-2017-12-09...
/nix/store/4zl144ry2i968jizh2fsfzbi4ajqg656-cataclysm-dda-0.C
/nix/store/g38v05w70qinaf9f42kspvb5814sf9vb-cataclysm-dda-git-2017-12-09

@mnacamura mnacamura deleted the cdda-fix-share-dir branch January 25, 2018 06:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GrahamcOfBorg GrahamcOfBorg

@rnhmjoj rnhmjoj

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@mnacamura @Mic92 @rnhmjoj @GrahamcOfBorg