26 lines
902 B
Diff
26 lines
902 B
Diff
|
diff --git a/SConstruct b/SConstruct
|
||
|
|
index 48fd080..419b40d 100644
|
||
|
|
--- a/SConstruct
|
||
|
|
+++ b/SConstruct
|
||
|
|
@@ -55,7 +55,7 @@ sky = env.Program("endless-sky", Glob("build/" + env["mode"] + "/*.cpp"))
|
||
|
|
|
||
|
|
|
||
|
|
# Install the binary:
|
||
|
|
-env.Install("$DESTDIR$PREFIX/games", sky)
|
||
|
|
+env.Install("$DESTDIR$PREFIX/bin", sky)
|
||
|
|
|
||
|
|
# Install the desktop file:
|
||
|
|
env.Install("$DESTDIR$PREFIX/share/applications", "endless-sky.desktop")
|
||
|
|
diff --git a/source/Files.cpp b/source/Files.cpp
|
||
|
|
index f5dec21..ad57c55 100644
|
||
|
|
--- a/source/Files.cpp
|
||
|
|
+++ b/source/Files.cpp
|
||
|
|
@@ -115,6 +115,7 @@ void Files::Init(const char * const *argv)
|
||
|
|
else if(IsParent(STANDARD_PATH, resources))
|
||
|
|
resources = STANDARD_PATH / RESOURCE_PATH;
|
||
|
|
#endif
|
||
|
|
+ resources = "%NIXPKGS_RESOURCES_PATH%";
|
||
|
|
}
|
||
|
|
// If the resources are not here, search in the directories containing this
|
||
|
|
// one. This allows, for example, a Mac app that does not actually have the
|