pyrox.dev
Merge pull request #153130 from legendofmiracles/colobot
colobot: 0.1.12 -> 0.2.0; fixes build
authored by legendofmiracles and committed by GitHub 6da66eb5 42bee8ec
+2
-2
pkgs/games/colobot/data.nix
+2
-2
pkgs/games/colobot/data.nix
···
4
4
5
5
stdenv.mkDerivation rec {
6
6
pname = "colobot-data";
7
-
version = "0.1.12-alpha";
7
+
version = "0.2.0-alpha";
8
8
9
9
src = fetchFromGitHub {
10
10
owner = "colobot";
11
11
repo = "colobot-data";
12
12
rev = "colobot-gold-${version}";
13
-
sha256 = "1vm33s52ymwd03x24i9bqiglw5v3wgd7rlzyx9r5ww0nnqzwbwi6";
13
+
sha256 = "sha256-yzIbAzrGsDe6hO0GHF9gjnj7IE8B7+5LDbvjZi4Wtms=";
14
14
};
15
15
16
16
nativeBuildInputs = [ cmake vorbis-tools xmlstarlet doxygen python3 ];
+3
-12
pkgs/games/colobot/default.nix
+3
-12
pkgs/games/colobot/default.nix
···
9
9
pname = "colobot";
10
10
# Maybe require an update to package colobot-data as well
11
11
# in file data.nix next to this one
12
-
version = "0.1.12-alpha";
12
+
version = "0.2.0-alpha";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "colobot";
16
-
repo = "colobot";
16
+
repo = pname;
17
17
rev = "colobot-gold-${version}";
18
-
sha256 = "0viq5s4zqs33an7rdmc3anf74ml7mwwcwf60alhvp9hj5jr547s2";
18
+
sha256 = "sha256-Nu7NyicNIk5yza9sXfd4KbGdB65guVuGREd6rwRU3lU=";
19
19
};
20
-
21
-
patches = [
22
-
# Fix issue with newer compilers, like used in nixpkgs
23
-
# https://github.com/colobot/colobot/pull/1291
24
-
(fetchpatch {
25
-
url = "https://github.com/colobot/colobot/commit/fc2bd68876ac6302dbc8e91e8ffa33592db14b21.patch";
26
-
sha256 = "sha256-PKe8jeyHpTT86tprSafQhNqTYBrSonz+r2fL1lVJdfo=";
27
-
})
28
-
];
29
20
30
21
nativeBuildInputs = [ cmake xmlstarlet doxygen python3 ];
31
22
buildInputs = [ boost SDL2 SDL2_image SDL2_ttf libpng glew gettext libsndfile libvorbis libogg physfs openal ];