Merge pull request #112571 from helsinki-systems/upd/widelands

widelands: 20 -> 21
This commit is contained in:
Sandro 2021-02-10 09:18:59 +01:00 committed by GitHub
commit 98d5d3d2f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 11 deletions

View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "widelands";
version = "20";
version = "21";
meta = with lib; {
description = "RTS with multiple-goods economy";
@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}.tar.bz2";
sha256 = "1cmwfwk7j6yi2pwmm4rm57s23sdzasqf53nx6567sdagqyc4sn9q";
url = "https://launchpad.net/widelands/build${version}/build${version}/+download/widelands-build${version}-source.tar.gz";
sha256 = "sha256-YB4OTG+Rs/sOzizRuD7PsCNEobkZT7tw7z9w4GmU41c=";
};
preConfigure = ''
@ -45,12 +45,8 @@ stdenv.mkDerivation rec {
SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf
];
prePatch = ''
substituteInPlace ./debian/org.widelands.widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/"
'';
postInstall = ''
mkdir -p "$out/share/applications/"
cp -v "../debian/org.widelands.widelands.desktop" "$out/share/applications/"
cp -v "../xdg/org.widelands.Widelands.desktop" "$out/share/applications/"
'';
}

View File

@ -27264,9 +27264,7 @@ in
wesnoth-dev = wesnoth;
widelands = callPackage ../games/widelands {
lua = lua5_2;
};
widelands = callPackage ../games/widelands { };
worldofgoo = callPackage ../games/worldofgoo { };