diff --git a/pkgs/games/colobot/data.nix b/pkgs/games/colobot/data.nix index 7ae9dbb2b5ed..761c68c15e81 100644 --- a/pkgs/games/colobot/data.nix +++ b/pkgs/games/colobot/data.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "colobot-data"; - version = "0.1.12-alpha"; + version = "0.2.0-alpha"; src = fetchFromGitHub { owner = "colobot"; repo = "colobot-data"; rev = "colobot-gold-${version}"; - sha256 = "1vm33s52ymwd03x24i9bqiglw5v3wgd7rlzyx9r5ww0nnqzwbwi6"; + sha256 = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms="; }; nativeBuildInputs = [ cmake vorbis-tools xmlstarlet doxygen python3 ]; diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix index b26244ccc5fd..e1070843811c 100644 --- a/pkgs/games/colobot/default.nix +++ b/pkgs/games/colobot/default.nix @@ -9,24 +9,15 @@ stdenv.mkDerivation rec { pname = "colobot"; # Maybe require an update to package colobot-data as well # in file data.nix next to this one - version = "0.1.12-alpha"; + version = "0.2.0-alpha"; src = fetchFromGitHub { owner = "colobot"; - repo = "colobot"; + repo = pname; rev = "colobot-gold-${version}"; - sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2"; + sha256 = "sha256-Nu7NyicNIk5yza9sXfd4KbGdB65guVuGREd6rwRU3lU="; }; - patches = [ - # Fix issue with newer compilers, like used in nixpkgs - # https://github.com/colobot/colobot/pull/1291 - (fetchpatch { - url = "https://github.com/colobot/colobot/commit/fc2bd68876ac6302dbc8e91e8ffa33592db14b21.patch"; - sha256 = "sha256-PKe8jeyHpTT86tprSafQhNqTYBrSonz+r2fL1lVJdfo="; - }) - ]; - nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ]; buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ];