tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/source/Files.cpp b/source/Files.cpp
2index bb03ecf..6e37336 100644
3--- a/source/Files.cpp
4+++ b/source/Files.cpp
5@@ -135,6 +135,7 @@ void Files::Init(const char * const *argv)
6 else if(IsParent(STANDARD_PATH, resources))
7 resources = STANDARD_PATH / RESOURCE_PATH;
8 #endif
9+ resources = "%NIXPKGS_RESOURCES_PATH%";
10 }
11 // If the resources are not here, search in the directories containing this
12 // one. This allows, for example, a Mac app that does not actually have the
13diff --git a/CMakeLists.txt b/CMakeLists.txt
14index 17f290163..169fef120 100644
15--- a/CMakeLists.txt
16+++ b/CMakeLists.txt
17@@ -312,7 +312,7 @@ elseif(WIN32)
18 include(CPack)
19 elseif(UNIX)
20 # Install the binary.
21- install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION games)
22+ install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION bin)
23
24 # Install the desktop file.
25 install(FILES io.github.endless_sky.endless_sky.desktop DESTINATION share/applications)