diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
| commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
| tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/games/spring | |
| parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
| parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
| download | nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixpkgs-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip | |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
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 efab1defbed..78b9e155642 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 = [ @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { boost libpng libX11 libnotify gtk doxygen makeWrapper glib minizip alure ]; + patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed + enableParallelBuilding = true; postInstall = '' |