push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
--- a/src/downloader/lib/src/Downloader/CurlWrapper.cpp
+++ b/src/downloader/lib/src/Downloader/CurlWrapper.cpp
@@ -108,7 +108,6 @@
if (res != CURLE_OK) {
LOG_WARN("Error setting CURLOPT_CAPATH: %d", res);
}
- return;
}
const std::string cafile = GetCAFilePath();

View File

@@ -0,0 +1,16 @@
--- a/src/utils/slpaths.cpp
+++ b/src/utils/slpaths.cpp
@@ -165,13 +165,10 @@
usync_paths.push_back(bundle);
}
if (!SlPaths::IsPortableMode()) {
- /*
-//FIXME: reenable when #707 is fixed / spring 102.0 is "established"
LSL::SpringBundle systembundle;
if (LSL::SpringBundle::LocateSystemInstalledSpring(systembundle)) {
usync_paths.push_back(systembundle);
}
-*/
std::vector<std::string> paths;
PossibleEnginePaths(paths);

View File

@@ -0,0 +1,83 @@
{
lib,
stdenv,
fetchurl,
cmake,
wxGTK32,
openal,
pkg-config,
curl,
libtorrent-rasterbar,
libpng,
libX11,
gettext,
boost,
libnotify,
gtk3,
doxygen,
spring,
makeWrapper,
glib,
minizip,
alure,
pcre,
jsoncpp,
}:
stdenv.mkDerivation rec {
pname = "springlobby";
version = "0.273";
src = fetchurl {
url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2";
sha256 = "sha256-XkU6i6ABCgw3H9vJu0xjHRO1BglueYM1LyJxcZdOrDk=";
};
nativeBuildInputs = [
cmake
pkg-config
gettext
doxygen
makeWrapper
];
buildInputs = [
wxGTK32
openal
curl
libtorrent-rasterbar
pcre
jsoncpp
boost
libpng
libX11
libnotify
gtk3
glib
minizip
alure
];
patches = [
./revert_58b423e.patch # Allows springLobby to continue using system installed spring until #707 is fixed
./fix-certs.patch
];
postInstall = ''
wrapProgram $out/bin/springlobby \
--prefix PATH : "${spring}/bin" \
--set SPRING_BUNDLE_DIR "${spring}/lib"
'';
meta = with lib; {
homepage = "https://springlobby.springrts.com";
description = "Cross-platform lobby client for the Spring RTS project";
license = licenses.gpl2Plus;
maintainers = with maintainers; [
qknight
];
platforms = [
"i686-linux"
"x86_64-linux"
];
};
}