Merge pull request #202776 from wegank/springlobby-wxgtk (cee75d23) · Commits · nix / nixpkgs

pkgs/games/spring/springlobby.nix

+6 −11

Original line number	Diff line number	Diff line
		{ lib
		, stdenv
		, fetchurl
		, fetchpatch
		, cmake
		, wxGTK30
		, wxGTK32
		, openal
		, pkg-config
		, curl
		@@ -13,7 +12,7 @@
		, gettext
		, boost
		, libnotify
		, gtk2
		, gtk3
		, doxygen
		, spring
		, makeWrapper
		@@ -26,16 +25,16 @@

		stdenv.mkDerivation rec {
		pname = "springlobby";
		version = "0.270";
		version = "0.273";

		src = fetchurl {
		url = "https://springlobby.springrts.com/dl/stable/springlobby-${version}.tar.bz2";
		sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs";
		sha256 = "sha256-XkU6i6ABCgw3H9vJu0xjHRO1BglueYM1LyJxcZdOrDk=";
		};

		nativeBuildInputs = [ cmake pkg-config gettext doxygen makeWrapper ];
		buildInputs = [
		wxGTK30
		wxGTK32
		openal
		curl
		libtorrent-rasterbar
		@@ -45,7 +44,7 @@ stdenv.mkDerivation rec {
		libpng
		libX11
		libnotify
		gtk2
		gtk3
		glib
		minizip
		alure
		@@ -54,10 +53,6 @@ stdenv.mkDerivation rec {
		patches = [
		./revert_58b423e.patch # Allows springLobby to continue using system installed spring until #707 is fixed
		./fix-certs.patch
		(fetchpatch {
		url = "https://github.com/springlobby/springlobby/commit/252c4cb156c1442ed9b4faec3f26265bc7c295ff.patch";
		sha256 = "sha256-Nq1F5fRPnCkZwl9KgrfuUmpIMK3hUOyZQYIKElWpmzU=";
		})
		];

		postInstall = ''