diff options
| author | Ricardo Ardissone <ricardo.ardissone@gmail.com> | 2016-08-24 22:20:32 -0300 |
|---|---|---|
| committer | Ricardo Ardissone <ricardo.ardissone@gmail.com> | 2016-08-24 22:20:32 -0300 |
| commit | 3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d (patch) | |
| tree | a4d8f0ce0b6fadf0b01489e6ef8e8ef17d4bb834 /pkgs/games/spring | |
| parent | 95bc33c1ab1ff2dd324f0e3fe05e2c6ecea4ece9 (diff) | |
| download | nixpkgs-3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d.tar nixpkgs-3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d.tar.gz nixpkgs-3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d.tar.bz2 nixpkgs-3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d.tar.lz nixpkgs-3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d.tar.xz nixpkgs-3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d.tar.zst nixpkgs-3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d.zip | |
springLobby: 0.247 -> 0.255
Diffstat (limited to 'pkgs/games/spring')
| -rw-r--r-- | pkgs/games/spring/revert_58b423e.patch | 16 | ||||
| -rw-r--r-- | pkgs/games/spring/springlobby.nix | 6 |
2 files changed, 20 insertions, 2 deletions
diff --git a/pkgs/games/spring/revert_58b423e.patch b/pkgs/games/spring/revert_58b423e.patch new file mode 100644 index 00000000000..79a42cefa5a --- /dev/null +++ b/pkgs/games/spring/revert_58b423e.patch @@ -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); diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 2cd9f24721f..62a5d81320f 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -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 = '' |