ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-12 23:27:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #153130 from legendofmiracles/colobot

Browse Source 
colobot: 0.1.12 -> 0.2.0; fixes build
This commit is contained in:
legendofmiracles 2022-01-02 08:12:27 -06:00 committed by GitHub
commit 6da66eb59e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/games/colobot/data.nix
View File

@ -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 ];

15
pkgs/games/colobot/default.nix
View File

@ -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 ];