diff options
author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2022-12-08 23:27:28 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-08 23:27:28 +0000 |
commit | c2ce38dfecc81264365d8faf90446f2e7720d112 (patch) | |
tree | 52da80582d3b79b3470358fb4a05176c6e670108 /pkgs/games | |
parent | 35fc64585f6f67857669d44bd3d8c096cdd42dab (diff) | |
parent | 3193b7c81035524c851db099e202300151370001 (diff) |
Merge pull request #205089 from wegank/btanks-python
btanks: python2 -> python3
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/btanks/default.nix | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 202bab0df667b..cec88ab51bdc2 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, sconsPackages, pkg-config, SDL, libGL, zlib, smpeg +{ lib, stdenv, fetchurl, fetchpatch, scons, pkg-config, SDL, libGL, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua }: stdenv.mkDerivation rec { @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz"; + hash = "sha256-P9LOaitF96YMOxFPqa/xPLPdn7tqZc3JeYt2xPosQ0E="; }; - nativeBuildInputs = [ sconsPackages.scons_3_0_1 pkg-config ]; + nativeBuildInputs = [ scons pkg-config ]; buildInputs = [ SDL libGL zlib smpeg SDL_image libvorbis expat zip lua ]; @@ -20,17 +20,25 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks"; - sha256 = "0ip563kz6lhwiims5djrxq3mvb7jx9yzkpsqxxhbi9n6qzz7y2az"; name = "lua52.patch"; + url = "https://aur.archlinux.org/cgit/aur.git/plain/lua52.patch?h=btanks&id=cd0e016963238f16209baa2da658aa3fad36e33d"; + hash = "sha256-Xwl//sfGprhg71jf+X3q8qxdB+5ZtqJrjBxS8+cw5UY="; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/gcc-4.7.patch"; - sha256 = "1dxlk1xh69gj10sqcsyckiakb8an3h41206wby4z44mpmvxc7pi4"; + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/gcc-4.7.patch"; + hash = "sha256-JN7D+q63EvKJX9wAEQgcVqE1VZzMa4Y1CPIlA3uYtLc="; }) (fetchpatch { - url = "https://salsa.debian.org/games-team/btanks/raw/master/debian/patches/pow10f.patch"; - sha256 = "1h45790v2dpdbccfn6lwfgl8782q54i14cz9gpipkaghcka4y0g9"; + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/pow10f.patch"; + hash = "sha256-6QFP1GTwqXnjfekzEiIpWKCD6HOcGusYW+02sUE6hcA="; + }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/python3.patch"; + hash = "sha256-JpK409Myi8mxQaunmLFKKh1NKvKLXpNHHsDvRee8OoQ="; + }) + (fetchpatch { + url = "https://salsa.debian.org/games-team/btanks/-/raw/debian/0.9.8083-9/debian/patches/scons.patch"; + hash = "sha256-JCvBY2fOV8Sc/mpvEsJQv1wKcS1dHqYxvRk6I9p7ZKc="; }) ]; |