keeperrl: init at alpha24 #43409
Closed
keeperrl: init at alpha24 #43409
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
infinisil
requested changes
Jul 29, 2018
| CFLAGS = "-I${SDL2.dev}/include/SDL2"; | ||
|
|
||
| installPhase = '' | ||
| mkdir -p $out/keeperrl |
There was a problem hiding this comment.
Should store data files in $out/share/keeperrl instead. And you can use a single line:
mkdir -p $out/share/keeperrl $out/bin
|
|
||
| makeFlags = [ "OPT=true" "RELEASE=true" ]; | ||
|
|
||
| CFLAGS = "-I${SDL2.dev}/include/SDL2"; |
There was a problem hiding this comment.
What error is there when you remove this line?
There was a problem hiding this comment.
g++ -MMD -Wall -std=c++1y -Wno-sign-compare -Wno-unused-variable -Wno-shift-count-overflow -Wno-tautological-constant-out-of-range-compare -Wno-mismatched-tags -ftemplate-depth=512 -DDATA_DIR=\"ATA_DIR\" -DRELEASE -O3 -I. -I./extern -c animation.cpp -o obj-opt/animation.o
In file included from sdl.h:11,
from renderer.h:19,
from animation.cpp:5:
/nix/store/9rgym24jflmh4lqw0xhv752xjhwai7yj-SDL2_image-2.0.5/include/SDL2/SDL_image.h:27:10: fatal error: SDL.h: No such file or directory
#include "SDL.h"
| --run "rm data_free || true" \ | ||
| --run "rm data_contrib || true" \ | ||
| --run "ln -s $out/keeperrl/data_free ." \ | ||
| --run "ln -s $out/keeperrl/data_contrib ." |
There was a problem hiding this comment.
I don't think these hacks are needed anymore. See miki151/keeperrl#376 (comment) and miki151/keeperrl#568
There was a problem hiding this comment.
Changed it for both DATA_DIR and USER_DIR. I just wonder where should be a note somewhere for users explaining what to do if they have the paid data dir.
|
What is the status of this pull request? |
10 tasks
|
I deleted my fork and recreated it so I don't think I can fix this PR, so I opened another: #43409 |
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.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)Is the version name ok?
Does someone have a cleaner way to deal with a program that thinks it always runs with write permission on the compilation dir? miki151/keeperrl#376
I think that you can just put the data folder for the paid version on ~/.keeperrl, in case someone can test this.