nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 16:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #101794 from bobvanderlinden/springlobby-0.270-fix

Browse Source 
springlobby: fix build failure
This commit is contained in:
Domen Kožar 2020-10-27 10:38:44 +01:00 committed by GitHub
commit 791b40e320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/games/spring/springlobby.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar { stdenv, fetchurl, fetchpatch, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar
, libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring , libpng, libX11, gettext, boost, libnotify, gtk2, doxygen, spring
, makeWrapper, glib, minizip, alure, pcre, jsoncpp }: , makeWrapper, glib, minizip, alure, pcre, jsoncpp }:
@ -11,13 +11,20 @@ stdenv.mkDerivation rec {
sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs"; sha256 = "1r1g2hw9ipsmsmzbhsi7bxqra1za6x7j1kw12qzl5psqyq8rqbgs";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ cmake pkgconfig gettext doxygen makeWrapper ];
buildInputs = [ buildInputs = [
cmake wxGTK30 openal curl gettext libtorrentRasterbar pcre jsoncpp wxGTK30 openal curl libtorrentRasterbar pcre jsoncpp
boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure boost libpng libX11 libnotify gtk2 glib minizip alure
]; ];
patches = [ ./revert_58b423e.patch ./fix-certs.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed 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=";
})
];
enableParallelBuilding = true; enableParallelBuilding = true;