Merge pull request #217863 from ralismark/naev

authored by

Sandro and committed by
GitHub
ecc25d82 a34b768a

+72 -25
+6
maintainers/maintainer-list.nix
··· 12308 12308 githubId = 314564; 12309 12309 name = "Ryan Lahfa"; 12310 12310 }; 12311 + ralismark = { 12312 + email = "nixpkgs@ralismark.xyz"; 12313 + github = "ralismark"; 12314 + githubId = 13449732; 12315 + name = "Temmie"; 12316 + }; 12311 12317 raphaelr = { 12312 12318 email = "raphael-git@tapesoftware.net"; 12313 12319 matrix = "@raphi:tapesoftware.net";
+66 -25
pkgs/games/naev/default.nix
··· 1 - { lib, fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkg-config, libvorbis 2 - , libpng, libGLU, libGL, makeWrapper, zlib, freetype }: 1 + { lib 2 + , SDL2 3 + , SDL2_image 4 + , enet 5 + , fetchFromGitHub 6 + , freetype 7 + , glpk 8 + , intltool 9 + , libpng 10 + , libunibreak 11 + , libvorbis 12 + , libwebp 13 + , libxml2 14 + , luajit 15 + , meson 16 + , ninja 17 + , openal 18 + , openblas 19 + , pcre2 20 + , physfs 21 + , pkg-config 22 + , python3 23 + , stdenv 24 + , suitesparse 25 + }: 3 26 4 - let 27 + stdenv.mkDerivation rec { 5 28 pname = "naev"; 6 - version = "0.5.0"; 7 - name = "${pname}-${version}"; 8 - in 9 - stdenv.mkDerivation { 10 - inherit name; 29 + version = "0.10.4"; 11 30 12 - srcData = fetchurl { 13 - url = "mirror://sourceforge/naev/ndata-${version}"; 14 - sha256 = "0l05xxbbys3j5h6anvann2vylhp6hnxnzwpcaydaff8fpbbyi6r6"; 31 + src = fetchFromGitHub { 32 + owner = "naev"; 33 + repo = "naev"; 34 + rev = "v${version}"; 35 + sha256 = "sha256-2cMRmKeoF6x5+95GoDgsoZG9QQo7qATrw/X+335l6FE="; 36 + fetchSubmodules = true; 15 37 }; 16 38 17 - src = fetchurl { 18 - url = "mirror://sourceforge/naev/${name}.tar.bz2"; 19 - sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; 20 - }; 39 + buildInputs = [ 40 + SDL2 41 + SDL2_image 42 + enet 43 + freetype 44 + glpk 45 + intltool 46 + libpng 47 + libunibreak 48 + libvorbis 49 + libwebp 50 + libxml2 51 + luajit 52 + openal 53 + openblas 54 + pcre2 55 + physfs 56 + suitesparse 57 + ]; 21 58 22 - buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU libGL zlib freetype ]; 59 + nativeBuildInputs = [ 60 + (python3.withPackages (ps: with ps; [ pyyaml mutagen ])) 61 + meson 62 + ninja 63 + pkg-config 64 + ]; 23 65 24 - nativeBuildInputs = [ pkg-config makeWrapper ]; 25 - 26 - env.NIX_CFLAGS_COMPILE = "-include ${zlib.dev}/include/zlib.h"; 66 + mesonFlags = [ 67 + "-Ddocs_c=disabled" 68 + "-Ddocs_lua=disabled" 69 + "-Dluajit=enabled" 70 + ]; 27 71 28 - postInstall = '' 29 - mkdir -p $out/share/naev 30 - cp -v $srcData $out/share/naev/ndata 31 - wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata 72 + postPatch = '' 73 + patchShebangs --build dat/outfits/bioship/generate.py utils/build/*.py utils/*.py 32 74 ''; 33 75 34 76 meta = { 35 77 description = "2D action/rpg space game"; 36 78 homepage = "http://www.naev.org"; 37 79 license = lib.licenses.gpl3Plus; 38 - maintainers = with lib.maintainers; [viric]; 80 + maintainers = with lib.maintainers; [ ralismark ]; 39 81 platforms = lib.platforms.linux; 40 - hydraPlatforms = []; 41 82 }; 42 83 }