about summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-12-03 02:15:51 +0100
committerGitHub <noreply@github.com>2022-12-03 02:15:51 +0100
commitcee75d23a9825985cad20b0deaac752766f6725c (patch)
tree2141f74ce06fae8a180238cdc32f3b2a1dbbed6a /pkgs/games
parentde4eb33b76d6722cb80721d7efec48475a262401 (diff)
parent16b756939be70c6967d73a52eccbfa6fbe4ef2eb (diff)
Merge pull request #202776 from wegank/springlobby-wxgtk
springLobby: 0.270 -> 0.273
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/spring/springlobby.nix17
1 files changed, 6 insertions, 11 deletions
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 6d6a47864a065..ab792cf41a49e 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -1,9 +1,8 @@
 { 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 = ''