diff --git a/pkgs/by-name/en/endless-sky/fixes.patch b/pkgs/by-name/en/endless-sky/fixes.patch index 2983ab5e66e9..47c20c0cdd72 100644 --- a/pkgs/by-name/en/endless-sky/fixes.patch +++ b/pkgs/by-name/en/endless-sky/fixes.patch @@ -1,21 +1,8 @@ -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 +index bb03ecf..6e37336 100644 --- a/source/Files.cpp +++ b/source/Files.cpp -@@ -115,6 +115,7 @@ void Files::Init(const char * const *argv) +@@ -135,6 +135,7 @@ void Files::Init(const char * const *argv) else if(IsParent(STANDARD_PATH, resources)) resources = STANDARD_PATH / RESOURCE_PATH; #endif @@ -23,3 +10,16 @@ index f5dec21..ad57c55 100644 } // 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 +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17f290163..169fef120 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -312,7 +312,7 @@ elseif(WIN32) + include(CPack) + elseif(UNIX) + # Install the binary. +- install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION games) ++ install(TARGETS EndlessSky CONFIGURATIONS Release RUNTIME DESTINATION bin) + + # Install the desktop file. + install(FILES io.github.endless_sky.endless_sky.desktop DESTINATION share/applications) diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix index d19399b2eb62..dcca64a2730c 100644 --- a/pkgs/by-name/en/endless-sky/package.nix +++ b/pkgs/by-name/en/endless-sky/package.nix @@ -8,20 +8,22 @@ libX11, glew, openal, - scons, + cmake, + pkg-config, libmad, libuuid, + minizip, }: stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.10.12"; + version = "0.10.14"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; tag = "v${version}"; - hash = "sha256-cT/bklRGQnS9Nm8J0oH1mG20JQOe58FAAHToNDpvPpQ="; + hash = "sha256-/jW9TXmK2xgHUQe6H+WSCHPQthxvoNepdkdnOD3sXXo="; }; patches = [ @@ -33,17 +35,14 @@ stdenv.mkDerivation rec { # endless sky naively joins the paths with string concatenation # so it's essential that there be a trailing slash on the resources path substituteInPlace source/Files.cpp \ - --replace '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/" - ''; - - preBuild = '' - export AR="${stdenv.cc.targetPrefix}gcc-ar" + --replace-fail '%NIXPKGS_RESOURCES_PATH%' "$out/share/games/endless-sky/" ''; enableParallelBuilding = true; nativeBuildInputs = [ - scons + cmake + pkg-config ]; buildInputs = [ @@ -55,10 +54,9 @@ stdenv.mkDerivation rec { openal libmad libuuid + minizip ]; - prefixKey = "PREFIX="; - meta = with lib; { description = "Sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; mainProgram = "endless-sky"; @@ -69,7 +67,10 @@ stdenv.mkDerivation rec { cc-by-sa-40 publicDomain ]; - maintainers = with maintainers; [ _360ied ]; + maintainers = with maintainers; [ + _360ied + lilacious + ]; platforms = platforms.linux; # Maybe other non-darwin Unix }; }