diff options
| author | Domen Kožar <domen@dev.si> | 2016-08-26 12:04:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-26 12:04:50 +0200 |
| commit | 6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c (patch) | |
| tree | ddb33870165ced699c816f4b7bb813a52c22d912 /pkgs/games/spring | |
| parent | b83dee4a6c7dc66ef47b6ac244d36fe3cdd61796 (diff) | |
| parent | 3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d (diff) | |
| download | nixpkgs-6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c.tar nixpkgs-6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c.tar.gz nixpkgs-6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c.tar.bz2 nixpkgs-6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c.tar.lz nixpkgs-6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c.tar.xz nixpkgs-6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c.tar.zst nixpkgs-6a4e95b918ec87156bbf43b34b6ee80ee6d9c72c.zip | |
Merge pull request #17979 from rardiol/springrts2
Springrts and springlobby update
Diffstat (limited to 'pkgs/games/spring')
| -rw-r--r-- | pkgs/games/spring/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/spring/revert_58b423e.patch | 16 | ||||
| -rw-r--r-- | pkgs/games/spring/springlobby.nix | 6 |
3 files changed, 22 insertions, 4 deletions
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 5b14e287f2c..634389d1410 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "spring-${version}"; - version = "102.0"; + version = "103.0"; src = fetchurl { url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma"; - sha256 = "0gjlpzwl3bdv1ickm8r3xlrbc6dm7m8i968hw3p0an49k6bqa77i"; + sha256 = "1fmnwk8ig36429pkp1rafzg4hyzp7i6mwy27p7fdxrdj1q4blx9l"; }; # The cmake included module correcly finds nix's glew, however 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 = '' |