forked from mirrors/nixpkgs
springLobby: 0.247 -> 0.255
This commit is contained in:
parent
95bc33c1ab
commit
3b7304ebc3
16
pkgs/games/spring/revert_58b423e.patch
Normal file
16
pkgs/games/spring/revert_58b423e.patch
Normal 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);
|
|
@ -4,11 +4,11 @@
|
|||
stdenv.mkDerivation rec {
|
||||
|
||||
name = "springlobby-${version}";
|
||||
version = "0.247";
|
||||
version = "0.255";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
|
||||
sha256 = "0sx14k4xsyjkmphhxfn9q341lv32c53g6wl1cbdx2sknzs3qasxs";
|
||||
sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
|
||||
'';
|
||||
|
||||
patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
postInstall = ''
|
||||
|
|
Loading…
Reference in a new issue