git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #119979 from Radvendii/mar1d-bump

mar1d: 0.2.0 -> 0.3.0

commit6942038dbf0f145be840dd18867975df77acbe56 authorSandro <sandro.jaeckel@gmail.com> dateSat 24 Apr 2021, 08:56 (6 years ago) parent6d495d5f097578
1 file changed+22−46
pkgs/games/mar1d/default.nix+22−46
pkgs/games/mar1d/default.nix+22−46
@@ -1,58 +1,34 @@
1−{ lib, stdenv
2−, fetchFromGitHub
3−, cmake
1+{ stdenv
2+, lib
3+, SDL2
4+, SDL2_mixer
45, libGLU
5−, xlibsWrapper
6−, xorg
7−, xinput_calibrator
8−, doxygen
9−, libpthreadstubs
10−, alsaLib
11−, alsaOss
12−, libao
13−, width ? 30
14−, mute ? false
15−, effects ? false
16−, sensitivity ? 5
17−, reverseY ? false
6+, libconfig
7+, meson
8+, ninja
9+, pkg-config
10+, fetchFromGitHub
1811}:
1912
2013stdenv.mkDerivation rec {
2114 pname = "MAR1D";
22− version = "0.2.0";
23− options = "-w${toString width}"
24− + " -s${toString sensitivity}"
25− + (if mute then " -m" else "")
26− + (if effects then " -f" else "")
27− + (if reverseY then " -r" else "");
15+ version = "0.3.0";
2816
2917 src = fetchFromGitHub {
30− sha256 = "152w5dnlxzv60cl24r5cmrj2q5ar0jiimrmxnp87kf4d2dpbnaq7";
18+ sha256 = "sha256-/QZH2H0PFCLeweXUE11vimLnJTt86PjnTnHC9vWkKsk=";
3119 rev = "v${version}";
32− repo = "fp_mario";
33− owner = "olynch";
20+ repo = "MAR1D";
21+ owner = "Radvendii";
3422 };
3523
36− buildInputs =
37− [
38− alsaLib
39− alsaOss
40− cmake
41− doxygen
42− libao
43− libpthreadstubs
44− libGLU
45− xlibsWrapper
46− xinput_calibrator
47− xorg.libXrandr
48− xorg.libXi
49− xorg.xinput
50− xorg.libXxf86vm
51− ];
24+ nativeBuildInputs = [ meson ninja pkg-config ];
5225
53− preConfigure = ''
54− cd src
55− '';
26+ buildInputs = [
27+ SDL2
28+ SDL2_mixer
29+ libconfig
30+ libGLU
31+ ];
5632
5733 meta = with lib; {
5834 description = "First person Super Mario Bros";
@@ -62,9 +38,9 @@ stdenv.mkDerivation rec {
6238 original, however, the game still takes place in a two dimensional world.
6339 You must view the world as mario does, as a one dimensional line.
6440 '';
65− homepage = "https://github.com/olynch/fp_mario";
41+ homepage = "https://mar1d.com";
6642 license = licenses.agpl3;
6743 maintainers = with maintainers; [ taeer ];
68− platforms = platforms.linux;
44+ platforms = platforms.unix;
6945 };
7046}